From 335248c9b7cf590f03c67aa0cadfcf95627fedd5 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 17 Sep 2000 13:02:52 +0000 Subject: [PATCH] Support for DESTDIR make variable. This is used as in `make install DESTDIR=/else/where' and prepends the value of DESTDIR to the full installation paths (e.g., /else/where/usr/local/pgsql/bin). This allows users to install the package into a location different from the one that was configured and hard-coded into various scripts, e.g., for creating binary packages. DESTDIR is in many cases preferrable over `make install prefix=/else/where' because a) `prefix' affects the path that is hard-coded into the files, which can lead to a `make install prefix=xxx' (as done by the regression test driver) corrupting the files in the source tree with wrong paths. b) it doesn't work at all if a directory was overridden to not depend on `prefix', e.g., --sysconfdir=/etc. (Updating the regression test driver to use DESTDIR is a separate undertaking.) See also autoconf@gnu.org, From: Akim Demaille , Date: 08 Sep 2000 12:48:59 +0200, Message-ID: , Subject: Re: HTML format documentation. --- doc/Makefile | 12 +++++------ src/Makefile.shlib | 18 ++++++++-------- src/backend/Makefile | 32 ++++++++++++++-------------- src/backend/catalog/Makefile | 14 ++++++------ src/bin/initdb/Makefile | 8 +++---- src/bin/initlocation/Makefile | 8 +++---- src/bin/ipcclean/Makefile | 8 +++---- src/bin/pg-config/Makefile | 8 +++---- src/bin/pg_ctl/Makefile | 8 +++---- src/bin/pg_dump/Makefile | 14 ++++++------ src/bin/pg_encoding/Makefile | 8 +++---- src/bin/pg_id/Makefile | 8 +++---- src/bin/pg_passwd/Makefile | 8 +++---- src/bin/pgaccess/Makefile | 20 ++++++++--------- src/bin/pgtclsh/Makefile | 10 ++++----- src/bin/psql/Makefile | 8 +++---- src/bin/scripts/Makefile | 8 +++---- src/include/Makefile | 11 +++++----- src/interfaces/ecpg/include/Makefile | 6 +++--- src/interfaces/ecpg/lib/Makefile | 4 ++-- src/interfaces/ecpg/preproc/Makefile | 6 +++--- src/interfaces/libpgeasy/Makefile | 8 +++---- src/interfaces/libpgtcl/Makefile | 8 +++---- src/interfaces/libpq++/Makefile | 12 +++++------ src/interfaces/libpq/Makefile | 12 +++++------ src/interfaces/odbc/GNUmakefile | 10 ++++----- src/pl/plperl/GNUmakefile | 10 ++++----- src/pl/plpgsql/src/Makefile | 8 +++---- src/pl/tcl/Makefile | 8 +++---- 29 files changed, 151 insertions(+), 152 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 2be5912895..d04f6af207 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/doc/Makefile,v 1.18 2000/07/17 22:31:57 petere Exp $ +# $Header: /cvsroot/pgsql/doc/Makefile,v 1.19 2000/09/17 13:02:28 petere Exp $ # #---------------------------------------------------------------------------- @@ -38,21 +38,21 @@ all: install: all installdirs ifneq ($(strip $(found_MODULES)),) for module in $(found_MODULES); do \ - gunzip -c $${module}.tar.gz | ( cd $(docdir)/$$module && $(TAR) xf - ) || \ + gzip -d -c $${module}.tar.gz | ( cd $(DESTDIR)$(docdir)/$$module && $(TAR) xf - ) || \ exit; \ done endif ifdef found_man - gunzip -c man.tar.gz | ( cd $(mandir) && $(TAR) xf - ) + gzip -d -c man.tar.gz | ( cd $(DESTDIR)$(mandir) && $(TAR) xf - ) endif installdirs: - $(mkinstalldirs) $(mandir) $(addprefix $(docdir)/, . $(found_MODULES)) + $(mkinstalldirs) $(DESTDIR)$(mandir) $(addprefix $(DESTDIR)$(docdir)/, . $(found_MODULES)) uninstall: - -rm -rf $(addprefix $(docdir)/, $(MODULES)) + -rm -rf $(addprefix $(DESTDIR)$(docdir)/, $(MODULES)) ifdef found_man - -rm -f $(addprefix $(mandir)/, $(shell gunzip -c man.tar.gz | tar tf -)) + -rm -f $(addprefix $(DESTDIR)$(mandir)/, $(shell gunzip -c man.tar.gz | tar tf -)) endif diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 467cfc18d7..b08a59f691 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.22 2000/07/07 01:23:43 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.23 2000/09/17 13:02:29 petere Exp $ # #------------------------------------------------------------------------- @@ -274,19 +274,19 @@ endif # shlib install-lib: install-lib-static install-lib-shared install-lib-static: lib$(NAME).a - $(INSTALL_DATA) $< $(libdir)/lib$(NAME).a + $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/lib$(NAME).a ifdef shlib install-lib-shared: $(shlib) - $(INSTALL_SHLIB) $< $(libdir)/$(shlib) + $(INSTALL_SHLIB) $< $(DESTDIR)$(libdir)/$(shlib) ifneq ($(PORTNAME), win) ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)) - cd $(libdir) && \ + cd $(DESTDIR)$(libdir) && \ rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) endif ifneq ($(shlib), lib$(NAME)$(DLSUFFIX)) - cd $(libdir) && \ + cd $(DESTDIR)$(libdir) && \ rm -f lib$(NAME)$(DLSUFFIX) && \ $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX) endif @@ -301,11 +301,11 @@ endif # shlib .PHONY: uninstall-lib uninstall-lib: - rm -f $(libdir)/lib$(NAME).a + rm -f $(DESTDIR)$(libdir)/lib$(NAME).a ifdef shlib - rm -f $(libdir)/lib$(NAME)$(DLSUFFIX) \ - $(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) \ - $(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + rm -f $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX) \ + $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) \ + $(DESTDIR)$(libdir)/lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif # shlib diff --git a/src/backend/Makefile b/src/backend/Makefile index c584d9ba29..f6965ef563 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.64 2000/08/31 16:09:23 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.65 2000/09/17 13:02:30 petere Exp $ # #------------------------------------------------------------------------- @@ -119,23 +119,23 @@ distprep: install: all installdirs install-bin ifeq ($(PORTNAME), win) ifeq ($(MAKE_DLL), true) - $(INSTALL_DATA) libpostgres.a $(libdir)/libpostgres.a + $(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a endif endif $(MAKE) -C catalog install-bki - $(INSTALL_DATA) libpq/pg_hba.conf.sample $(datadir)/pg_hba.conf.sample - $(INSTALL_DATA) libpq/pg_ident.conf.sample $(datadir)/pg_ident.conf.sample - $(INSTALL_DATA) utils/misc/postgresql.conf.sample $(datadir)/postgresql.conf.sample + $(INSTALL_DATA) libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample + $(INSTALL_DATA) libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample + $(INSTALL_DATA) utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample installdirs: - $(mkinstalldirs) $(bindir) $(libdir) $(datadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(datadir) install-bin: postgres $(POSTGRES_IMP) installdirs - $(INSTALL_PROGRAM) postgres$(X) $(bindir)/postgres$(X) - @rm -f $(bindir)/postmaster - ln -s postgres$(X) $(bindir)/postmaster + $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X) + @rm -f $(DESTDIR)$(bindir)/postmaster + ln -s postgres$(X) $(DESTDIR)$(bindir)/postmaster ifeq ($(MAKE_EXPORTS), true) - $(INSTALL_DATA) $(POSTGRES_IMP) $(libdir)/$(POSTGRES_IMP) + $(INSTALL_DATA) $(POSTGRES_IMP) $(DESTDIR)$(libdir)/$(POSTGRES_IMP) endif .PHONY: install-bin @@ -143,19 +143,19 @@ endif ########################################################################## uninstall: - rm -f $(bindir)/postgres$(X) $(bindir)/postmaster + rm -f $(DESTDIR)$(bindir)/postgres$(X) $(DESTDIR)$(bindir)/postmaster ifeq ($(MAKE_EXPORTS), true) - rm -f $(libdir)/$(POSTGRES_IMP) + rm -f $(DESTDIR)$(libdir)/$(POSTGRES_IMP) endif ifeq ($(PORTNAME), win) ifeq ($(MAKE_DLL), true) - rm -f $(libdir)/libpostgres.a + rm -f $(DESTDIR)$(libdir)/libpostgres.a endif endif $(MAKE) -C catalog uninstall-bki - rm -f $(datadir)/pg_hba.conf.sample \ - $(datadir)/pg_ident.conf.sample \ - $(datadir)/postgresql.conf.sample + rm -f $(DESTDIR)$(datadir)/pg_hba.conf.sample \ + $(DESTDIR)$(datadir)/pg_ident.conf.sample \ + $(DESTDIR)$(datadir)/postgresql.conf.sample ########################################################################## diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 696853f06c..4a1aa665a8 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for catalog # -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.24 2000/08/31 16:09:49 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.25 2000/09/17 13:02:30 petere Exp $ # #------------------------------------------------------------------------- @@ -43,17 +43,17 @@ template1.bki template1.description: genbki.sh $(TEMPLATE1_BKI_SRCS) .PHONY: install-bki install-bki: $(BKIFILES) installdirs - $(INSTALL_DATA) global.bki $(datadir)/global.bki - $(INSTALL_DATA) global.description $(datadir)/global.description - $(INSTALL_DATA) template1.bki $(datadir)/template1.bki - $(INSTALL_DATA) template1.description $(datadir)/template1.description + $(INSTALL_DATA) global.bki $(DESTDIR)$(datadir)/global.bki + $(INSTALL_DATA) global.description $(DESTDIR)$(datadir)/global.description + $(INSTALL_DATA) template1.bki $(DESTDIR)$(datadir)/template1.bki + $(INSTALL_DATA) template1.description $(DESTDIR)$(datadir)/template1.description installdirs: - $(mkinstalldirs) $(datadir) + $(mkinstalldirs) $(DESTDIR)$(datadir) .PHONY: uninstall-bki uninstall-bki: - rm -f $(addprefix $(datadir)/, $(BKIFILES)) + rm -f $(addprefix $(DESTDIR)$(datadir)/, $(BKIFILES)) clean: diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index d856f8b4db..754d984342 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.23 2000/09/08 18:29:21 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.24 2000/09/17 13:02:31 petere Exp $ # #------------------------------------------------------------------------- @@ -23,13 +23,13 @@ initdb: initdb.sh $(top_builddir)/src/Makefile.global chmod a+x $@ install: all installdirs - $(INSTALL_SCRIPT) initdb $(bindir)/initdb + $(INSTALL_SCRIPT) initdb $(DESTDIR)$(bindir)/initdb installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/initdb + rm -f $(DESTDIR)$(bindir)/initdb clean distclean maintainer-clean: rm -f initdb diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile index 2ea19e0462..7c1f3e4930 100644 --- a/src/bin/initlocation/Makefile +++ b/src/bin/initlocation/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.11 2000/09/08 18:29:22 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.12 2000/09/17 13:02:32 petere Exp $ # #------------------------------------------------------------------------- @@ -19,13 +19,13 @@ initlocation: initlocation.sh chmod a+x $@ install: all installdirs - $(INSTALL_SCRIPT) initlocation $(bindir)/initlocation + $(INSTALL_SCRIPT) initlocation $(DESTDIR)$(bindir)/initlocation installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/initlocation + rm -f $(DESTDIR)$(bindir)/initlocation clean distclean maintainer-clean: rm -f initlocation diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile index 43d640afea..043f9cc855 100644 --- a/src/bin/ipcclean/Makefile +++ b/src/bin/ipcclean/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.13 2000/09/08 18:29:23 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.14 2000/09/17 13:02:33 petere Exp $ # #------------------------------------------------------------------------- @@ -19,13 +19,13 @@ ipcclean: ipcclean.sh chmod a+x $@ install: all installdirs - $(INSTALL_SCRIPT) ipcclean $(bindir)/ipcclean + $(INSTALL_SCRIPT) ipcclean $(DESTDIR)$(bindir)/ipcclean installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/ipcclean + rm -f $(DESTDIR)$(bindir)/ipcclean clean distclean maintainer-clean: rm -f ipcclean diff --git a/src/bin/pg-config/Makefile b/src/bin/pg-config/Makefile index 241d722c16..150f04643b 100644 --- a/src/bin/pg-config/Makefile +++ b/src/bin/pg-config/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/Makefile,v 1.2 2000/09/08 18:29:26 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/Makefile,v 1.3 2000/09/17 13:02:34 petere Exp $ subdir = src/bin/pg-config top_builddir = ../../.. @@ -17,13 +17,13 @@ pg-config: pg-config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefi chmod a+x $@ install: all installdirs - $(INSTALL_SCRIPT) pg-config $(bindir)/pg-config + $(INSTALL_SCRIPT) pg-config $(DESTDIR)$(bindir)/pg-config installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pg-config + rm -f $(DESTDIR)$(bindir)/pg-config clean distclean maintainer-clean: rm -f pg-config diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index dc7defbd21..716d93cea2 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1999, PostgreSQL Global Development Group # -# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.8 2000/09/08 18:29:27 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.9 2000/09/17 13:02:35 petere Exp $ # #------------------------------------------------------------------------- @@ -19,13 +19,13 @@ pg_ctl: pg_ctl.sh chmod a+x $@ install: all installdirs - $(INSTALL_SCRIPT) pg_ctl $(bindir)/pg_ctl + $(INSTALL_SCRIPT) pg_ctl $(DESTDIR)$(bindir)/pg_ctl installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pg_ctl + rm -f $(DESTDIR)$(bindir)/pg_ctl clean distclean maintainer-clean: rm -f pg_ctl diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 53d0e8e930..11424b11c4 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.24 2000/09/08 18:29:27 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.25 2000/09/17 13:02:36 petere Exp $ # #------------------------------------------------------------------------- @@ -41,16 +41,16 @@ submake: $(MAKE) -C $(libpq_builddir) all install: all installdirs - $(INSTALL_PROGRAM) pg_dump$(X) $(bindir)/pg_dump$(X) - $(INSTALL_PROGRAM) pg_restore$(X) $(bindir)/pg_restore$(X) - $(INSTALL_SCRIPT) pg_dumpall $(bindir)/pg_dumpall - $(INSTALL_SCRIPT) pg_upgrade $(bindir)/pg_upgrade + $(INSTALL_PROGRAM) pg_dump$(X) $(DESTDIR)$(bindir)/pg_dump$(X) + $(INSTALL_PROGRAM) pg_restore$(X) $(DESTDIR)$(bindir)/pg_restore$(X) + $(INSTALL_SCRIPT) pg_dumpall $(DESTDIR)$(bindir)/pg_dumpall + $(INSTALL_SCRIPT) pg_upgrade $(DESTDIR)$(bindir)/pg_upgrade installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(addprefix $(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall pg_upgrade) + rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall pg_upgrade) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/bin/pg_encoding/Makefile b/src/bin/pg_encoding/Makefile index fcb6c3ec77..e4c4e4c65c 100644 --- a/src/bin/pg_encoding/Makefile +++ b/src/bin/pg_encoding/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998, PostgreSQL Global Development Group # -# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.10 2000/08/31 16:11:15 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.11 2000/09/17 13:02:37 petere Exp $ # #------------------------------------------------------------------------- @@ -25,13 +25,13 @@ submake: $(MAKE) -C $(libpq_builddir) all install: all installdirs - $(INSTALL_PROGRAM) pg_encoding$(X) $(bindir)/pg_encoding$(X) + $(INSTALL_PROGRAM) pg_encoding$(X) $(DESTDIR)$(bindir)/pg_encoding$(X) installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pg_encoding$(X) + rm -f $(DESTDIR)$(bindir)/pg_encoding$(X) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile index ec0ded2d21..ed9ec2ce06 100644 --- a/src/bin/pg_id/Makefile +++ b/src/bin/pg_id/Makefile @@ -4,7 +4,7 @@ # # Copyright (C) 2000 by PostgreSQL Global Development Team # -# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.18 2000/08/31 16:11:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.19 2000/09/17 13:02:39 petere Exp $ # #------------------------------------------------------------------------- @@ -18,13 +18,13 @@ pg_id$(X): pg_id.o $(CC) -o $@ $^ $(LDFLAGS) install: all installdirs - $(INSTALL_PROGRAM) pg_id$(X) $(bindir)/pg_id$(X) + $(INSTALL_PROGRAM) pg_id$(X) $(DESTDIR)$(bindir)/pg_id$(X) installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pg_id$(X) + rm -f $(DESTDIR)$(bindir)/pg_id$(X) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/bin/pg_passwd/Makefile b/src/bin/pg_passwd/Makefile index e58d1f9b0e..74838dc3ad 100644 --- a/src/bin/pg_passwd/Makefile +++ b/src/bin/pg_passwd/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/bin/pg_passwd/Attic/Makefile,v 1.10 2000/08/31 16:11:20 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_passwd/Attic/Makefile,v 1.11 2000/09/17 13:02:41 petere Exp $ subdir = src/bin/pg_passwd top_builddir = ../../.. @@ -10,13 +10,13 @@ pg_passwd$(X): pg_passwd.o $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) install: all installdirs - $(INSTALL_PROGRAM) pg_passwd$(X) $(bindir)/pg_passwd$(X) + $(INSTALL_PROGRAM) pg_passwd$(X) $(DESTDIR)$(bindir)/pg_passwd$(X) installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pg_passwd$(X) + rm -f $(DESTDIR)$(bindir)/pg_passwd$(X) depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile index 4b8a545560..359f98f4e5 100644 --- a/src/bin/pgaccess/Makefile +++ b/src/bin/pgaccess/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.11 2000/08/31 16:11:20 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgaccess/Attic/Makefile,v 1.12 2000/09/17 13:02:41 petere Exp $ # #------------------------------------------------------------------------- @@ -20,19 +20,19 @@ pgaccess: pgaccess.sh sed -e 's,__wish__,$(WISH),' -e 's,__PGACCESSHOME__,$(pgaccessdir),' < $< > $@ install: all installdirs - $(INSTALL_SCRIPT) pgaccess $(bindir)/pgaccess - $(INSTALL_SCRIPT) main.tcl $(pgaccessdir) - for i in lib/*.tcl; do $(INSTALL_DATA) $$i $(pgaccessdir)/lib || exit 1; done - for i in lib/help/*.hlp; do $(INSTALL_DATA) $$i $(pgaccessdir)/lib/help || exit 1; done - for i in lib/languages/[a-z]*; do $(INSTALL_DATA) $$i $(pgaccessdir)/lib/languages || exit 1; done - for i in images/*.gif; do $(INSTALL_DATA) $$i $(pgaccessdir)/images || exit 1; done + $(INSTALL_SCRIPT) pgaccess $(DESTDIR)$(bindir)/pgaccess + $(INSTALL_SCRIPT) main.tcl $(DESTDIR)$(pgaccessdir) + for i in lib/*.tcl; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib || exit 1; done + for i in lib/help/*.hlp; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/help || exit 1; done + for i in lib/languages/[a-z]*; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/lib/languages || exit 1; done + for i in images/*.gif; do $(INSTALL_DATA) $$i $(DESTDIR)$(pgaccessdir)/images || exit 1; done installdirs: - $(mkinstalldirs) $(bindir) $(pgaccessdir)/lib/help $(pgaccessdir)/lib/languages $(pgaccessdir)/images + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pgaccessdir)/lib/help $(DESTDIR)$(pgaccessdir)/lib/languages $(DESTDIR)$(pgaccessdir)/images uninstall: - rm -f $(bindir)/pgaccess - rm -rf $(pgaccessdir) + rm -f $(DESTDIR)$(bindir)/pgaccess + rm -rf $(DESTDIR)$(pgaccessdir) clean distclean maintainer-clean: rm -f pgaccess diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile index 9c3f2995aa..e2ae981f9e 100644 --- a/src/bin/pgtclsh/Makefile +++ b/src/bin/pgtclsh/Makefile @@ -5,7 +5,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.31 2000/08/31 16:11:21 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.32 2000/09/17 13:02:42 petere Exp $ # #------------------------------------------------------------------------- @@ -52,16 +52,16 @@ submake: $(MAKE) -C $(libpgtcl_builddir) all install: all installdirs - $(INSTALL_PROGRAM) pgtclsh $(bindir)/pgtclsh + $(INSTALL_PROGRAM) pgtclsh $(DESTDIR)$(bindir)/pgtclsh ifeq ($(USE_TK), true) - $(INSTALL_PROGRAM) pgtksh $(bindir)/pgtksh + $(INSTALL_PROGRAM) pgtksh $(DESTDIR)$(bindir)/pgtksh endif installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/pgtclsh $(bindir)/pgtksh + rm -f $(DESTDIR)$(bindir)/pgtclsh $(DESTDIR)$(bindir)/pgtksh Makefile.tcldefs: mkMakefile.tcldefs.sh $(SHELL) $< '$(TCL_CONFIG_SH)' '$@' diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index a5d1b15cad..fe84492ed3 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.24 2000/08/31 16:11:23 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.25 2000/09/17 13:02:43 petere Exp $ # #------------------------------------------------------------------------- @@ -68,13 +68,13 @@ submake: distprep: $(srcdir)/sql_help.h install: all installdirs - $(INSTALL_PROGRAM) psql$(X) $(bindir)/psql$(X) + $(INSTALL_PROGRAM) psql$(X) $(DESTDIR)$(bindir)/psql$(X) installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/psql$(X) + rm -f $(DESTDIR)$(bindir)/psql$(X) depend dep: $(CC) -MM -MG $(CFLAGS) *.c >depend diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index 85ef899048..829dc136bd 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.9 2000/09/08 18:29:28 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.10 2000/09/17 13:02:44 petere Exp $ # #------------------------------------------------------------------------- @@ -23,13 +23,13 @@ createlang: createlang.sh chmod a+x $@ install: all installdirs - for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(bindir) || exit; done + for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(DESTDIR)$(bindir)/$$i || exit; done installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(addprefix $(bindir)/, $(SCRIPTS)) + rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) clean distclean maintainer-clean: rm -f createlang diff --git a/src/include/Makefile b/src/include/Makefile index 0ebd4a9d6b..a238c1114b 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -5,7 +5,7 @@ # Install exported headers to the include directory (these headers are # the minimal ones needed to build loadable backend extensions). # -# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.3 2000/08/31 16:11:27 petere Exp $ +# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.4 2000/09/17 13:02:44 petere Exp $ # #------------------------------------------------------------------------- @@ -35,18 +35,17 @@ $(top_builddir)/src/backend/utils/fmgroids.h: $(top_srcdir)/src/backend/utils/Ge install: all installdirs - @for i in $(HEADERS); do \ - echo "$(INSTALL_DATA) $(srcdir)/$$i $(includedir)/$$i"; \ - $(INSTALL_DATA) $(srcdir)/$$i $(includedir)/$$i; \ + for i in $(HEADERS); do \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$i || exit; \ done # Automatically pick out the needed subdirectories for the include # tree. installdirs: - $(mkinstalldirs) $(addprefix $(includedir)/, $(sort $(dir $(HEADERS)))) + $(mkinstalldirs) $(addprefix $(DESTDIR)$(includedir)/, $(sort $(dir $(HEADERS)))) uninstall: - rm -f $(addprefix $(includedir)/, $(HEADERS)) + rm -f $(addprefix $(DESTDIR)$(includedir)/, $(HEADERS)) clean: rm -f utils/fmgroids.h parser/parse.h diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile index 9255fe78b5..5f59b7db89 100644 --- a/src/interfaces/ecpg/include/Makefile +++ b/src/interfaces/ecpg/include/Makefile @@ -7,10 +7,10 @@ install: all installdirs install-headers .PHONY: install-headers ecpg_headers = ecpgerrno.h ecpglib.h ecpgtype.h sqlca.h sql3types.h install-headers: $(ecpg_headers) - for i in $^; do $(INSTALL_DATA) $$i $(includedir); done + for i in $^; do $(INSTALL_DATA) $$i $(DESTDIR)$(includedir); done installdirs: - $(mkinstalldirs) $(includedir) + $(mkinstalldirs) $(DESTDIR)$(includedir) uninstall: - rm -f $(addprefix $(includedir)/, $(ecpg_headers)) + rm -f $(addprefix $(DESTDIR)$(includedir)/, $(ecpg_headers)) diff --git a/src/interfaces/ecpg/lib/Makefile b/src/interfaces/ecpg/lib/Makefile index 7e63ef2b91..2706060e5e 100644 --- a/src/interfaces/ecpg/lib/Makefile +++ b/src/interfaces/ecpg/lib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.7 2000/08/31 16:11:36 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile,v 1.8 2000/09/17 13:02:46 petere Exp $ # #------------------------------------------------------------------------- @@ -32,7 +32,7 @@ include $(top_srcdir)/src/Makefile.shlib install: all installdirs install-lib installdirs: - $(mkinstalldirs) $(libdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) uninstall: uninstall-lib diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index aeb0a0fc07..81fe459da7 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -41,13 +41,13 @@ endif distprep: $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c install: all installdirs - $(INSTALL_PROGRAM) ecpg$(X) $(bindir) + $(INSTALL_PROGRAM) ecpg$(X) $(DESTDIR)$(bindir) installdirs: - $(mkinstalldirs) $(bindir) + $(mkinstalldirs) $(DESTDIR)$(bindir) uninstall: - rm -f $(bindir)/ecpg$(X) + rm -f $(DESTDIR)$(bindir)/ecpg$(X) clean distclean: rm -f *.o ecpg$(X) diff --git a/src/interfaces/libpgeasy/Makefile b/src/interfaces/libpgeasy/Makefile index d31775665e..02a04cdb9b 100644 --- a/src/interfaces/libpgeasy/Makefile +++ b/src/interfaces/libpgeasy/Makefile @@ -2,7 +2,7 @@ # # Makefile for src/interfaces/libpgeasy # -# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.2 2000/08/31 16:11:42 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.3 2000/09/17 13:02:48 petere Exp $ # #------------------------------------------------------------------------- @@ -36,13 +36,13 @@ install: all installdirs install-headers install-lib .PHONY: install-headers install-headers: libpgeasy.h - $(INSTALL_DATA) $< $(includedir)/libpgeasy.h + $(INSTALL_DATA) $< $(DESTDIR)$(includedir)/libpgeasy.h installdirs: - $(mkinstalldirs) $(libdir) $(includedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) uninstall: uninstall-lib - rm -f $(includedir)/libpgeasy.h + rm -f $(DESTDIR)$(includedir)/libpgeasy.h clean distclean maintainer-clean: clean-lib rm -f $(OBJS) diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile index cd9c1719eb..636891e3e8 100644 --- a/src/interfaces/libpgtcl/Makefile +++ b/src/interfaces/libpgtcl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.20 2000/08/31 16:11:45 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.21 2000/09/17 13:02:49 petere Exp $ # #------------------------------------------------------------------------- @@ -36,13 +36,13 @@ install: all installdirs install-headers install-lib .PHONY: install-headers install-headers: libpgtcl.h - $(INSTALL_DATA) $< $(includedir)/libpgtcl.h + $(INSTALL_DATA) $< $(DESTDIR)$(includedir)/libpgtcl.h installdirs: - $(mkinstalldirs) $(libdir) $(includedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) uninstall: uninstall-lib - rm -f $(includedir)/libpgtcl.h + rm -f $(DESTDIR)$(includedir)/libpgtcl.h clean distclean maintainer-clean: clean-lib rm -f $(OBJS) diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile index 8430acb7ab..8c4afddad5 100644 --- a/src/interfaces/libpq++/Makefile +++ b/src/interfaces/libpq++/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.24 2000/08/31 16:11:51 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.25 2000/09/17 13:02:50 petere Exp $ # #------------------------------------------------------------------------- @@ -72,15 +72,15 @@ LIBPGXXHEADERS = pgconnection.h pgdatabase.h pgtransdb.h pgcursordb.h pglobject. .PHONY: install-headers install-headers: $(MAINHEADER) $(LIBPGXXHEADERS) - $(INSTALL_DATA) $< $(includedir) - for i in $(LIBPGXXHEADERS); do $(INSTALL_DATA) $(srcdir)/$$i $(libpqxx_includedir) || exit 1; done + $(INSTALL_DATA) $< $(DESTDIR)$(includedir) + for i in $(LIBPGXXHEADERS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(libpqxx_includedir) || exit 1; done installdirs: - $(mkinstalldirs) $(libdir) $(includedir) $(libpqxx_includedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(libpqxx_includedir) uninstall: uninstall-lib - rm -f $(includedir)/$(MAINHEADER) - rm -rf $(libpqxx_includedir) + rm -f $(DESTDIR)$(includedir)/$(MAINHEADER) + for i in $(LIBPGXXHEADERS); do rm -f $(DESTDIR)$(libpqxx_includedir)/$$i || exit; done clean distclean maintainer-clean: clean-lib rm -f $(OBJS) diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index bd2dbd1db0..7da601702b 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.40 2000/08/31 16:11:48 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.41 2000/09/17 13:02:49 petere Exp $ # #------------------------------------------------------------------------- @@ -67,15 +67,15 @@ install: all installdirs install-headers install-lib .PHONY: install-headers install-headers: libpq-fe.h libpq-int.h pqexpbuffer.h - $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(includedir) - $(INSTALL_DATA) $(srcdir)/libpq-int.h $(includedir) - $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(includedir) + $(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir) installdirs: - $(mkinstalldirs) $(libdir) $(includedir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) uninstall: uninstall-lib - rm -f $(addprefix $(includedir)/, libpq-fe.h libpq-int.h pqexpbuffer.h) + rm -f $(addprefix ($DESTDIR)$(includedir)/, libpq-fe.h libpq-int.h pqexpbuffer.h) clean distclean maintainer-clean: clean-lib rm -f $(OBJS) dllist.c snprintf.c inet_aton.c common.c wchar.c conv.c big5.c diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile index 685a98f617..81c16387ca 100644 --- a/src/interfaces/odbc/GNUmakefile +++ b/src/interfaces/odbc/GNUmakefile @@ -2,7 +2,7 @@ # # GNUMakefile for psqlodbc (Postgres ODBC driver) # -# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.2 2000/08/31 16:11:55 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.3 2000/09/17 13:02:51 petere Exp $ # #------------------------------------------------------------------------- @@ -38,18 +38,18 @@ odbc_includedir = $(includedir)/iodbc install: all installdirs install-headers install-ini install-lib installdirs: - $(mkinstalldirs) $(odbc_includedir) $(libdir) $(odbcinst_ini_dir) + $(mkinstalldirs) $(DESTDIR)$(odbc_includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(odbcinst_ini_dir) .PHONY: install-headers install-headers: $(odbc_headers) - for i in $^; do $(INSTALL_DATA) $$i $(odbc_includedir) || exit 1; done + for i in $^; do $(INSTALL_DATA) $$i $(DESTDIR)$(odbc_includedir) || exit 1; done .PHONY: install-ini install-ini: odbcinst.ini - $(INSTALL_DATA) $< $(odbcinst_ini_dir) + $(INSTALL_DATA) $< $(DESTDIR)$(odbcinst_ini_dir) uninstall: uninstall-lib - rm -f $(addprefix $(odbc_includedir)/, $(odbc_headers)) + rm -f $(addprefix $(DESTDIR)$(odbc_includedir)/, $(odbc_headers)) clean distclean maintainer-clean: clean-lib rm -f $(OBJS) diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index a04eb8ba9f..4ccd7fde99 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -1,10 +1,10 @@ -# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.3 2000/08/31 16:12:13 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/plperl/GNUmakefile,v 1.4 2000/09/17 13:02:51 petere Exp $ subdir = src/pl/plperl top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -plperl_installdir = $(libdir) +plperl_installdir = $(DESTDIR)$(libdir) all: Makefile @@ -16,13 +16,13 @@ Makefile: Makefile.PL $(PERL) $< POLLUTE=1 install: all installdirs - $(MAKE) -f $< install + $(MAKE) -f Makefile install installdirs: - $(mkinstalldirs) $(plperl_installdir) + $(mkinstalldirs) $(DESTDIR)$(plperl_installdir) uninstall: - rm -f $(libdir)/plperl$(DLSUFFIX) + rm -f $(DESTDIR)$(libdir)/plperl$(DLSUFFIX) clean distclean maintainer-clean: -[ -f Makefile ] && $(MAKE) -f Makefile clean diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index 17780551b0..015f4a8ec4 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -2,7 +2,7 @@ # # Makefile for the plpgsql shared object # -# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.6 2000/08/28 11:53:23 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Makefile,v 1.7 2000/09/17 13:02:52 petere Exp $ # #------------------------------------------------------------------------- @@ -33,7 +33,7 @@ include $(top_srcdir)/src/Makefile.shlib install: installdirs all ifdef shlib - $(INSTALL_SHLIB) $(shlib) $(libdir)/plpgsql$(DLSUFFIX) + $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(libdir)/plpgsql$(DLSUFFIX) else @echo "*****"; \ echo "* PL/pgSQL was not installed due to lack of shared library support."; \ @@ -41,10 +41,10 @@ else endif installdirs: - $(mkinstalldirs) $(libdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) uninstall: - rm -f $(libdir)/plpgsql$(DLSUFFIX) + rm -f $(DESTDIR)$(libdir)/plpgsql$(DLSUFFIX) pl_handler.o pl_comp.o pl_exec.o pl_funcs.o: plpgsql.h $(srcdir)/pl.tab.h diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index c8f1ad5b8b..010367c23a 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.22 2000/08/31 16:12:17 petere Exp $ +# $Header: /cvsroot/pgsql/src/pl/tcl/Makefile,v 1.23 2000/09/17 13:02:52 petere Exp $ # #------------------------------------------------------------------------- @@ -98,13 +98,13 @@ ifeq ($(TCL_SHARED_BUILD), 1) all: $(INFILES) install: all installdirs - $(INSTALL_SHLIB) $(DLOBJS) $(libdir)/$(DLOBJS) + $(INSTALL_SHLIB) $(DLOBJS) $(DESTDIR)$(libdir)/$(DLOBJS) installdirs: - $(mkinstalldirs) $(libdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) uninstall: - rm -f $(libdir)/$(DLOBJS) + rm -f $(DESTDIR)$(libdir)/$(DLOBJS) else