DESTDIR removed, again.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index 9b3ed7ad2a5c896a490b1d06603e76495091410d..6740a3d144c4a13f3a48d3ba42e4cd4cc2b76ba7 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.31 1998/04/06 01:35:19 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.32 1998/04/06 16:49:14 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -125,31 +125,31 @@ clean:
 # and (2) the parameters of a database system should be set at initdb time,
 # not at postgres build time.
 
-install: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
+install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
          global1.bki.source local1_template1.bki.source \
          global1.description local1_template1.description \
          libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
-   $(INSTALL) $(INSTL_EXE_OPTS) postgres $(DESTDIR)$(BINDIR)/postgres
+   $(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
 ifeq ($(MAKE_EXPORTS), true)
-   $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
+   $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
 endif
-   @rm -f $(DESTDIR)$(BINDIR)/postmaster
-   ln -s postgres $(DESTDIR)$(BINDIR)/postmaster
-   $(INSTALL) $(INSTLOPTS) fmgr.h $(DESTDIR)$(HEADERDIR)/fmgr.h
+   @rm -f $(BINDIR)/postmaster
+   ln -s postgres $(BINDIR)/postmaster
+   $(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
    $(INSTALL) $(INSTLOPTS) global1.bki.source \
-     $(DESTDIR)$(LIBDIR)/global1.bki.source
+     $(LIBDIR)/global1.bki.source
    $(INSTALL) $(INSTLOPTS) global1.description \
-     $(DESTDIR)$(LIBDIR)/global1.description
+     $(LIBDIR)/global1.description
    $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
-     $(DESTDIR)$(LIBDIR)/local1_template1.bki.source
+     $(LIBDIR)/local1_template1.bki.source
    $(INSTALL) $(INSTLOPTS) local1_template1.description \
-     $(DESTDIR)$(LIBDIR)/local1_template1.description
+     $(LIBDIR)/local1_template1.description
    $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
-     $(DESTDIR)$(LIBDIR)/pg_hba.conf.sample
+     $(LIBDIR)/pg_hba.conf.sample
    $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
-     $(DESTDIR)$(LIBDIR)/pg_geqo.sample
+     $(LIBDIR)/pg_geqo.sample
 
-$(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(HEADERDIR): 
+$(BINDIR) $(LIBDIR) $(HEADERDIR): 
    mkdir $@
 
 #############################################################################

diff --git a/src/bin/cleardbdir/Makefile b/src/bin/cleardbdir/Makefile
index 12e2d1e10b6460887d8aecd5a42fcc2a79ae6c28..dc18f0072377bb59ecea1bc0d9ca6685a8d63ede 100644 (file)
--- a/src/bin/cleardbdir/Makefile
+++ b/src/bin/cleardbdir/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.7 1998/04/06 01:14:10 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.8 1998/04/06 16:49:24 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ cleardbdir:
    cp cleardbdir.sh cleardbdir
 
 install: cleardbdir
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean: 
    rm -f cleardbdir

diff --git a/src/bin/createdb/Makefile b/src/bin/createdb/Makefile
index 97e71ea6531400472ab63a5167ab87597273525f..5b5fa2dfdf4cf264a787a7991c9fa77c9d509461 100644 (file)
--- a/src/bin/createdb/Makefile
+++ b/src/bin/createdb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.7 1998/04/06 01:14:13 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.8 1998/04/06 16:49:28 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ createdb: createdb.sh
    cp createdb.sh createdb
 
 install: createdb
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f createdb

diff --git a/src/bin/createuser/Makefile b/src/bin/createuser/Makefile
index f03c925d15760fe8306b2eabe066a6e61d631454..ef3b13eb57d927c8fe3fae2d5d1344128d52e40f 100644 (file)
--- a/src/bin/createuser/Makefile
+++ b/src/bin/createuser/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.7 1998/04/06 01:14:18 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.8 1998/04/06 16:49:37 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ createuser: createuser.sh
    sed $(SEDSCRIPT) createuser
 
 install: createuser
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f createuser

diff --git a/src/bin/destroydb/Makefile b/src/bin/destroydb/Makefile
index 903118db58822bbe2b91fd281bb4f34985144009..ca0551905e5450c4ed1bfe9dd62b9c2a84d7237b 100644 (file)
--- a/src/bin/destroydb/Makefile
+++ b/src/bin/destroydb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.7 1998/04/06 01:14:26 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.8 1998/04/06 16:49:51 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ destroydb: destroydb.sh
    cp destroydb.sh destroydb
 
 install: destroydb
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f destroydb

diff --git a/src/bin/destroyuser/Makefile b/src/bin/destroyuser/Makefile
index 8311cf50b2006160a56b70eb7be16c494d04e858..a43959db24dbd1ed886e5b7a5ae836af681f9970 100644 (file)
--- a/src/bin/destroyuser/Makefile
+++ b/src/bin/destroyuser/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.7 1998/04/06 01:14:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.8 1998/04/06 16:50:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ destroyuser: destroyuser.sh
    sed $(SEDSCRIPT) destroyuser
 
 install: destroyuser
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f destroyuser

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 7d673d92820e38d82c25e7e08c0f5ea51babc348..59000129c22e6b6254fc5202666e8756b1d09788 100644 (file)
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.8 1998/04/06 02:10:49 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.9 1998/04/06 16:50:22 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ include ../../Makefile.global
 all: initdb
 
 install: initdb
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
 

diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index bc346b6d2862969618a30a70cb23d8233cc6df2d..4ea61f8dc152b75e53c7a547caaab9758a7875d7 100644 (file)
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.4 1998/04/06 01:15:01 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.5 1998/04/06 16:50:30 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@ initlocation: initlocation.sh
    cp -p initlocation.sh initlocation
 
 install: initlocation
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f initlocation

diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index 86b842c689fa034c2d4edcfd44852b90284cba56..74250c09684818154893a2c8f3e70d262d1e0aef 100644 (file)
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.6 1998/04/06 01:15:09 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.7 1998/04/06 16:50:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@ ipcclean:
    sed $(SEDSCRIPT) ipcclean
 
 install: ipcclean
-   $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
+   $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
 
 clean:
    rm -f ipcclean

diff --git a/src/bin/pg_dump/Makefile.in b/src/bin/pg_dump/Makefile.in
index efdbf6399c0d1b2f02f0f81fb6fa8a01cebd341b..7aaa9a2f714d696ba3f5453e0c1d2ec4d4b8ade1 100644 (file)
--- a/src/bin/pg_dump/Makefile.in
+++ b/src/bin/pg_dump/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.8 1998/04/06 01:15:16 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.9 1998/04/06 16:50:46 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -39,8 +39,8 @@ submake:
    $(MAKE) -C $(LIBPQDIR) libpq.a
 
 install: pg_dump
-   $(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(DESTDIR)$(BINDIR)/pg_dump
-   $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(DESTDIR)$(BINDIR)/pg_dumpall
+   $(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(BINDIR)/pg_dump
+   $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
 
 depend dep:
    $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
index 69496059434f2f7b59680ece228290ee68156a25..c98275678ce6cce59902e97c6eebb484141ca4f1 100644 (file)
--- a/src/bin/pg_id/Makefile
+++ b/src/bin/pg_id/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.10 1998/04/06 01:15:24 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.11 1998/04/06 16:51:04 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,7 +33,7 @@ $(LIBPQDIR)/libpq.a:
    $(MAKE) -C $(LIBPQDIR) libpq.a
 
 install: pg_id
-   $(INSTALL) $(INSTL_EXE_OPTS) pg_id $(DESTDIR)$(BINDIR)/pg_id
+   $(INSTALL) $(INSTL_EXE_OPTS) pg_id $(BINDIR)/pg_id
 
 depend dep:
    $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile
index 1ef0960d66f8f56bffc4296669dc04f254cb9c82..408640fea52ea62bac741b1212bfde396ce4ac9e 100644 (file)
--- a/src/bin/pg_passwd/Makefile
+++ b/src/bin/pg_passwd/Makefile
@@ -15,7 +15,7 @@ pg_passwd: $(OBJS)
    $(CC) -o pg_passwd $(OBJS) $(LDFLAGS)
 
 install: pg_passwd
-   $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(DESTDIR)$(BINDIR)/pg_passwd
+   $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(BINDIR)/pg_passwd
 
 .PHONY: submake
 submake:

diff --git a/src/bin/pg_version/Makefile.in b/src/bin/pg_version/Makefile.in
index 819dfbccf71384f042dad4d05c4a7b149624cd69..ed0eff2405508b1335fd687534ad724d8bf5ac10 100644 (file)
--- a/src/bin/pg_version/Makefile.in
+++ b/src/bin/pg_version/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.4 1998/04/06 01:15:44 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.5 1998/04/06 16:51:27 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -28,7 +28,7 @@ submake:
    $(MAKE) -C ../../utils version.o
 
 install: pg_version
-   $(INSTALL) $(INSTL_EXE_OPTS) pg_version $(DESTDIR)$(BINDIR)/pg_version
+   $(INSTALL) $(INSTL_EXE_OPTS) pg_version $(BINDIR)/pg_version
 
 depend dep:
    $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 3aee0223cc753c08754380fc412e6fbb6dc738c3..1efe8930918ba336fc64ef4a8ec0016963259980 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.16 1998/04/06 01:15:51 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.17 1998/04/06 16:51:35 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,8 +37,8 @@ pgtksh: pgtkAppInit.o
      $(X11_LIBS) -lm $(LDFLAGS)
 
 install: pgtclsh pgtksh
-   $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
-   $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
+   $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
+   $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
 
 clean:
    rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh

diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index e01674491e315b5ad527678243d3eb520209aaa3..071ab34c509fcaa3ea0b311a8eb92d903aa81191 100644 (file)
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.10 1998/04/06 01:15:55 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.11 1998/04/06 16:51:44 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -39,7 +39,7 @@ submake:
    $(MAKE) -C $(LIBPQDIR) libpq.a
 
 install: psql
-   $(INSTALL) $(INSTL_EXE_OPTS) psql $(DESTDIR)$(BINDIR)/psql
+   $(INSTALL) $(INSTL_EXE_OPTS) psql $(BINDIR)/psql
 
 depend dep:
    $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index caa13a8d9162c69d4e97c1a012fec985c5934f53..bfb6840b68c2ac0985961c55a3233fbd6bdbd7d8 100644 (file)
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -6,13 +6,13 @@ all clean::
    @echo Nothing to be done.
 
 install::
-   $(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)    
-   $(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)   
-   $(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)  
+   $(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)  
+   $(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR) 
+   $(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)    
 
 uninstall::
-   rm -f $(DESTDIR)$(HEADERDIR)/ecpglib.h
-   rm -f $(DESTDIR)$(HEADERDIR)/ecpgtype.h
-   rm -f $(DESTDIR)$(HEADERDIR)/sqlca.h
+   rm -f $(HEADERDIR)/ecpglib.h
+   rm -f $(HEADERDIR)/ecpgtype.h
+   rm -f $(HEADERDIR)/sqlca.h
 
 dep depend:

diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index dceeaf7c61919c21b76fe08b846a2812ebd4534e..f4039edf99cef72c7abc7a965a96505e79295913 100644 (file)
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -56,14 +56,14 @@ clean:
 dep depend:
 
 install: libecpg.a $(shlib) $(install-shlib-dep)
-   $(INSTALL) $(INSTLOPTS) libecpg.a $(DESTDIR)$(LIBDIR)
+   $(INSTALL) $(INSTLOPTS) libecpg.a $(LIBDIR)
 
 install-shlib:
-   $(INSTALL) $(INSTLOPTS) $(shlib) $(DESTDIR)$(LIBDIR)
-   ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libecpg.so
+   $(INSTALL) $(INSTLOPTS) $(shlib) $(LIBDIR)
+   ln -sf $(shlib) $(LIBDIR)/libecpg.so
 
 uninstall::
-   rm -f $(DESTDIR)$(LIBDIR)/libecpg.a $(DESTDIR)$(LIBDIR)/$(shlib)
+   rm -f $(LIBDIR)/libecpg.a $(LIBDIR)/$(shlib)
 
 # Rules that do something
 libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 89fa3373c473807a651032d4795fa1d69f3913db..af684bd3d572898cc89a3476c4ad783712035b2e 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -7,7 +7,7 @@ PATCHLEVEL=0
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
    -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-   -DINCLUDE_PATH=\"$(DESTDIR)$(HEADERDIR)\"
+   -DINCLUDE_PATH=\"$(HEADERDIR)\"
 
 all:: ecpg
 
@@ -15,10 +15,10 @@ clean:
    rm -f *.o core a.out ecpg y.tab.h y.tab.c pgc.c *~
 
 install: all
-   $(INSTALL) $(INSTL_EXE_OPTS) ecpg $(DESTDIR)$(BINDIR)
+   $(INSTALL) $(INSTL_EXE_OPTS) ecpg $(BINDIR)
 
 uninstall:
-   rm -f $(DESTDIR)$(BINDIR)/ecpg
+   rm -f $(BINDIR)/ecpg
 
 dep depend:
    $(CC) -MM $(CFLAGS) *.c > depend

diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index cb838875bbca06f0286cfdf2cc7a2df60b9fd8e8..5f78ba56ca6432edcd5cabd7af6185e3db8b4737 100644 (file)
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.10 1998/04/06 01:35:43 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.11 1998/04/06 16:52:15 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -88,18 +88,18 @@ $(shlib): $(OBJS)
 install: install-headers install-libpgtcl $(install-shlib-dep)
 
 install-headers: beforeinstall-headers libpgtcl.h
-   $(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
+   $(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
 
 beforeinstall-headers:
-   @if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
+   @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 
 install-libpgtcl: libpgtcl.a
-   $(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
+   $(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(LIBDIR)/libpgtcl.a
 
 install-shlib: $(shlib)
    $(INSTALL) $(INSTL_LIB_OPTS) $(shlib) \
-       $(DESTDIR)$(LIBDIR)/$(shlib)
-   ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libpgtcl.so
+       $(LIBDIR)/$(shlib)
+   ln -sf $(shlib) $(LIBDIR)/libpgtcl.so
 
 .PHONY: clean
 clean: 

diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index 6ed1715f8b062cc90f7b0d2ed9ee26abde50019d..5b1d5cfbc5d2f56f9ab169839d567eed8bcc1fe9 100644 (file)
--- a/src/interfaces/libpq++/Makefile
+++ b/src/interfaces/libpq++/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.15 1998/04/06 04:57:32 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.16 1998/04/06 16:52:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -94,26 +94,26 @@ LIBPGXXHEADERS = pgenv.h \
         pglobject.h
 
 install-headers: beforeinstall-headers $(MAINHEADER)
-   @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)$(HEADERDIR)/$(MAINHEADER)
+   @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
    @for i in ${LIBPGXXHEADERS}; do \
        echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
-       $(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)$(LIBPGXXHEADERDIR)/$$i; \
+       $(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
    done
 
 beforeinstall-headers:
-   @if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
-   @if [ ! -d $(DESTDIR)$(LIBPGXXHEADERDIR) ]; then mkdir $(DESTDIR)$(LIBPGXXHEADERDIR); fi
+   @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+   @if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
 
 beforeinstall-lib:
-   @if [ ! -d $(DESTDIR)$(LIBDIR) ] ; then mkdir $(DESTDIR)$(LIBDIR); fi
+   @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR); fi
 
 install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib
-   $(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(DESTDIR)$(LIBDIR)/$(LIBNAME).a
+   $(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(LIBDIR)/$(LIBNAME).a
 
 install-shlib: $(SHLIBNAME) beforeinstall-lib
-   $(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(DESTDIR)$(LIBDIR)/$(SHLIB)
-   rm -f $(DESTDIR)$(LIBDIR)/libpq++.so
-   ln -sf $(SHLIB) $(DESTDIR)$(LIBDIR)/libpq++.so
+   $(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(LIBDIR)/$(SHLIB)
+   rm -f $(LIBDIR)/libpq++.so
+   ln -sf $(SHLIB) $(LIBDIR)/libpq++.so
 
 
 doc:

diff --git a/src/interfaces/libpq++/man/Makefile b/src/interfaces/libpq++/man/Makefile
index bce4e0af3ed58e4a515ae7ddd4a1b75c3821212d..ab8752021a794a3ee0bb629a13b6a8316ab06a67 100644 (file)
--- a/src/interfaces/libpq++/man/Makefile
+++ b/src/interfaces/libpq++/man/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for doc directory to install man pages
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.4 1998/04/06 01:36:20 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.5 1998/04/06 16:52:47 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,6 +12,6 @@ SRCDIR= ../../..
 include ../../../Makefile.global
 
 install: 
-   -mkdir $(DESTDIR)$(POSTMANDIR)
-   -mkdir $(DESTDIR)$(POSTMANDIR)/man3
-   cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
+   -mkdir $(POSTMANDIR)
+   -mkdir $(POSTMANDIR)/man3
+   cp *.3* $(POSTMANDIR)/man3

diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 0a4005624b38ba165486077b8e0e5c2e46245fcf..0936314297ef98d854e238da2aa9f5f9ef2e4b13 100644 (file)
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.13 1998/04/06 01:35:53 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.14 1998/04/06 16:52:28 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -117,65 +117,65 @@ install-headers: beforeinstall-headers c.h \
                  $(SRCDIR)/include/libpq/libpq-fs.h $(SRCDIR)/include/lib/dllist.h \
                  $(SRCDIR)/include/utils/geo_decls.h libpq-fe.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
-          $(DESTDIR)$(HEADERDIR)/os.h
+          $(HEADERDIR)/os.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
-          $(DESTDIR)$(HEADERDIR)/config.h
+          $(HEADERDIR)/config.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
-          $(DESTDIR)$(HEADERDIR)/postgres.h
+          $(HEADERDIR)/postgres.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
-          $(DESTDIR)$(HEADERDIR)/postgres_ext.h
+          $(HEADERDIR)/postgres_ext.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
-          $(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
+          $(HEADERDIR)/libpq/pqcomm.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
-          $(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
+          $(HEADERDIR)/libpq/libpq-fs.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
-          $(DESTDIR)$(HEADERDIR)/lib/dllist.h
+          $(HEADERDIR)/lib/dllist.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
-          $(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
+          $(HEADERDIR)/utils/geo_decls.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
-          $(DESTDIR)$(HEADERDIR)/utils/elog.h
+          $(HEADERDIR)/utils/elog.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
-          $(DESTDIR)$(HEADERDIR)/utils/palloc.h
+          $(HEADERDIR)/utils/palloc.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
-          $(DESTDIR)$(HEADERDIR)/access/attnum.h
+          $(HEADERDIR)/access/attnum.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
-          $(DESTDIR)$(HEADERDIR)/executor/spi.h
+          $(HEADERDIR)/executor/spi.h
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
-          $(DESTDIR)$(HEADERDIR)/commands/trigger.h
-   $(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
+          $(HEADERDIR)/commands/trigger.h
+   $(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
 ifeq ($(PORTNAME), hpux)
    $(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
-          $(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
+          $(HEADERDIR)/port/hpux/fixade.h
 endif
-   $(INSTALL) $(INSTLOPTS) c.h $(DESTDIR)$(HEADERDIR)/c.h
+   $(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
 
 beforeinstall-headers:
-   @if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/port ]; then mkdir $(DESTDIR)$(HEADERDIR)/port; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME) ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME); fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/include ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/include; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/lib ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/lib; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/libpq ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/libpq; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/utils ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/utils; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/access ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/access; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/executor ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/executor; fi
-   @if [ ! -d $(DESTDIR)$(HEADERDIR)/commands ]; \
-       then mkdir $(DESTDIR)$(HEADERDIR)/commands; fi
+   @if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
+   @if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
+   @if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
+       then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
+   @if [ ! -d $(HEADERDIR)/include ]; \
+       then mkdir $(HEADERDIR)/include; fi
+   @if [ ! -d $(HEADERDIR)/lib ]; \
+       then mkdir $(HEADERDIR)/lib; fi
+   @if [ ! -d $(HEADERDIR)/libpq ]; \
+       then mkdir $(HEADERDIR)/libpq; fi
+   @if [ ! -d $(HEADERDIR)/utils ]; \
+       then mkdir $(HEADERDIR)/utils; fi
+   @if [ ! -d $(HEADERDIR)/access ]; \
+       then mkdir $(HEADERDIR)/access; fi
+   @if [ ! -d $(HEADERDIR)/executor ]; \
+       then mkdir $(HEADERDIR)/executor; fi
+   @if [ ! -d $(HEADERDIR)/commands ]; \
+       then mkdir $(HEADERDIR)/commands; fi
 
 install-libpq: libpq.a
-   $(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
+   $(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(LIBDIR)/libpq.a
 
 install-shlib: $(shlib)
-   $(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
-   rm -f $(DESTDIR)$(LIBDIR)/libpq.so
-   ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so
+   $(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
+   rm -f $(LIBDIR)/libpq.so
+   ln -s $(shlib) $(LIBDIR)/libpq.so
 
 depend dep:
    $(CC) -MM $(CFLAGS) *.c >depend

diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index ab9d22fa751cb5e77edd72d577950c68816e0713..0166e3d16774b12a9192b926c5d2f7184e3cff36 100644 (file)
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,4 +1,4 @@
-LDFLAGS+= -export-dynamic #-Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR)
+LDFLAGS+= -export-dynamic #-Wl,-rpath -Wl,$(LIBDIR)
 MK_NO_LORDER= true
 
 %.so: %.o

diff --git a/src/man/Makefile b/src/man/Makefile
index 33224edf4e4843b14a5b8435f58e3bc6b7c371b5..eb925ee54b4cf73ad4157b01bb92177f7bb60e7c 100644 (file)
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.6 1998/04/06 02:03:03 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.7 1998/04/06 16:53:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,15 +16,15 @@ SRCDIR=..
 include ../Makefile.global
 
 install:
-   -mkdir $(DESTDIR)$(POSTMANDIR)
-   -mkdir $(DESTDIR)$(POSTMANDIR)/man1
-   -mkdir $(DESTDIR)$(POSTMANDIR)/man3
-   -mkdir $(DESTDIR)$(POSTMANDIR)/man5
-   -mkdir $(DESTDIR)$(POSTMANDIR)/manl
-   cp *.1* $(DESTDIR)$(POSTMANDIR)/man1
-   cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
-   cp *.5* $(DESTDIR)$(POSTMANDIR)/man5
-   cp *.l* $(DESTDIR)$(POSTMANDIR)/manl
+   -mkdir $(POSTMANDIR)
+   -mkdir $(POSTMANDIR)/man1
+   -mkdir $(POSTMANDIR)/man3
+   -mkdir $(POSTMANDIR)/man5
+   -mkdir $(POSTMANDIR)/manl
+   cp *.1* $(POSTMANDIR)/man1
+   cp *.3* $(POSTMANDIR)/man3
+   cp *.5* $(POSTMANDIR)/man5
+   cp *.l* $(POSTMANDIR)/manl
 
 clean:
 

diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index 45075147638117010af4d18e580be06d7ea8f1c5..c1768e82abdefe4beea0c3e2cb2d82b7c0316f1a 100644 (file)
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for the pltcl shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.4 1998/04/06 01:16:55 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.5 1998/04/06 16:53:15 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -87,6 +87,6 @@ clean:
    rm -f Makefile.tcldefs
 
 install: all
-   $(INSTALL) $(INSTL_LIB_OPTS) $(DLOBJS) $(DESTDIR)$(LIBDIR)/$(DLOBJS)
+   $(INSTALL) $(INSTL_LIB_OPTS) $(DLOBJS) $(LIBDIR)/$(DLOBJS)
 
 dep depend: