From 2dfee9345773e6ac8809396bf99db538e134fea8 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Sun, 5 Apr 1998 22:02:56 +0000 Subject: [PATCH] Remove DISTDIR. --- src/bin/cleardbdir/Makefile | 4 ++-- src/bin/createdb/Makefile | 4 ++-- src/bin/createuser/Makefile | 4 ++-- src/bin/destroydb/Makefile | 4 ++-- src/bin/destroyuser/Makefile | 4 ++-- src/bin/initdb/Makefile | 4 ++-- src/bin/initlocation/Makefile | 4 ++-- src/bin/ipcclean/Makefile | 4 ++-- src/bin/pg_dump/Makefile.in | 6 +++--- src/bin/pg_id/Makefile | 4 ++-- src/bin/pg_passwd/Makefile | 2 +- src/bin/pg_version/Makefile.in | 4 ++-- src/bin/pgtclsh/Makefile | 6 +++--- src/bin/psql/Makefile.in | 4 ++-- src/interfaces/ecpg/include/Makefile | 12 ++++++------ src/interfaces/ecpg/lib/Makefile.in | 8 ++++---- src/interfaces/ecpg/preproc/Makefile | 6 +++--- src/interfaces/libpgtcl/Makefile.in | 8 ++++---- src/interfaces/libpq++/Makefile | 12 ++++++------ src/interfaces/libpq/Makefile.in | 10 +++++----- src/makefiles/Makefile.linux | 2 +- src/pl/tcl/Makefile | 4 ++-- 22 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/bin/cleardbdir/Makefile b/src/bin/cleardbdir/Makefile index 2464592066f..9326f0260a8 100644 --- 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.4 1996/11/24 03:55:19 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.5 1998/04/05 21:59:52 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 7e6191643f0..e79c00f8acc 100644 --- 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.4 1996/12/10 03:39:26 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.5 1998/04/05 21:59:55 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 3dfea19048f..c2ebf3b2836 100644 --- 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.4 1996/12/10 03:39:36 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.5 1998/04/05 21:59:59 momjian Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ createuser: createuser.sh sed $(SEDSCRIPT) <createuser.sh >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 ad5347556a2..95b8fa69444 100644 --- 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.4 1996/12/10 03:39:43 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.5 1998/04/05 22:00:08 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 9510ce61363..1641bc63494 100644 --- 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.4 1996/12/10 03:39:53 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.5 1998/04/05 22:00:20 momjian Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ destroyuser: destroyuser.sh sed $(SEDSCRIPT) <destroyuser.sh >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 edc008a4af2..06bb4b76402 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.4 1996/12/10 03:40:08 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.5 1998/04/05 22:00:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -24,7 +24,7 @@ initdb: initdb.sh sed $(SEDSCRIPT) <initdb.sh >initdb install: initdb - $(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$< + $(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$< clean: rm -f initdb diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile index 3de8f6fd14b..21d26ab2b9b 100644 --- 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.1 1997/11/07 06:21:34 thomas Exp $ +# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.2 1998/04/05 22:00:40 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 5eb5d7667d7..520244640fb 100644 --- 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.3 1996/12/10 03:40:23 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.4 1998/04/05 22:00:48 momjian Exp $ # #------------------------------------------------------------------------- @@ -23,7 +23,7 @@ ipcclean: sed $(SEDSCRIPT) <ipcclean.sh >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 6b5c5ef14a4..fa170a3208b 100644 --- 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.5 1998/01/04 19:12:06 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.6 1998/04/05 22:00:58 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 $(INCLUDE_OPT) *.c >depend diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile index ed9b7cf957f..41766e547bb 100644 --- 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.7 1998/01/04 19:12:11 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.8 1998/04/05 22:01:10 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 $(INCLUDE_OPT) *.c >depend diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile index 8edb3309c3f..439c1945c26 100644 --- 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 4758f7dd4e0..470d33f1727 100644 --- 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.1 1997/07/29 16:36:43 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.2 1998/04/05 22:01:30 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 $(INCLUDE_OPT) *.c >depend diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 2adc6f5310b..a386802bb4f 100644 --- 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.13 1998/03/23 06:02:39 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.14 1998/04/05 22:01: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 737cbe23ea2..9722413c05e 100644 --- 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.7 1998/04/05 21:29:35 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.8 1998/04/05 22:01:41 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 $(INCLUDE_OPT) *.c >depend diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile index 2658dd00483..739023a43e4 100644 --- a/src/interfaces/ecpg/include/Makefile +++ b/src/interfaces/ecpg/include/Makefile @@ -6,11 +6,11 @@ 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 diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index a39af1df627..b2da50ebe34 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -54,14 +54,14 @@ clean: rm -f *.o *.a core a.out *~ $(shlib) libecpg.so 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 9dc093aa231..26a953edecf 100644 --- 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 # Rule that really do something. ecpg: y.tab.o pgc.o type.o ecpg.o ../lib/typename.o diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in index 2703516f5b5..a5add6f9bfe 100644 --- 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.6 1998/04/05 20:28:23 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.7 1998/04/05 22:02:29 momjian Exp $ # #------------------------------------------------------------------------- @@ -94,12 +94,12 @@ beforeinstall-headers: @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 71670caf9ba..f83932630c0 100644 --- 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.10 1998/03/20 04:07:11 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.11 1998/04/05 22:02:41 momjian Exp $ # #------------------------------------------------------------------------- @@ -99,15 +99,15 @@ beforeinstall-headers: @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/Makefile.in b/src/interfaces/libpq/Makefile.in index d4261305e1c..aedcf95cf29 100644 --- 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.9 1998/03/20 04:07:02 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.10 1998/04/05 22:02:33 momjian Exp $ # #------------------------------------------------------------------------- @@ -170,12 +170,12 @@ beforeinstall-headers: 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 *.c >depend diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux index 8b440692c6d..459ad1550c7 100644 --- a/src/makefiles/Makefile.linux +++ b/src/makefiles/Makefile.linux @@ -2,7 +2,7 @@ ifdef LINUX_ELF # test for __ELF__ in C code so do not need LINUX_ELF defined # - thomas 1997-12-29 #CFLAGS+= -DLINUX_ELF -LDFLAGS+= -export-dynamic -Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR) +LDFLAGS+= -export-dynamic -Wl,-rpath -Wl,$(LIBDIR) endif MK_NO_LORDER= true diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index df516350b97..c02757aa3bb 100644 --- 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.1 1998/02/11 14:07:55 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.2 1998/04/05 22:02:56 momjian Exp $ # #------------------------------------------------------------------------- @@ -87,5 +87,5 @@ clean: rm -f Makefile.tcldefs install: all - $(INSTALL) $(INSTL_LIB_OPTS) $(DLOBJS) $(DESTDIR)$(LIBDIR)/$(DLOBJS) + $(INSTALL) $(INSTL_LIB_OPTS) $(DLOBJS) $(LIBDIR)/$(DLOBJS) -- GitLab