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 <akim@epita.fr>, Date: 08
Sep 2000 12:48:59 +0200, Message-ID:
<mv4em2vb1lw.fsf@nostromo.lrde.epita.fr>, Subject: Re: HTML format
documentation.

8 files changed, 33 insertions, 33 deletions

diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 9255fe78b5c..5f59b7db89d 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 7e63ef2b915..2706060e5e7 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 aeb0a0fc075..81fe459da78 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 d31775665e6..02a04cdb9b4 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 cd9c1719eba..636891e3e85 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 8430acb7abd..8c4afddad56 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 bd2dbd1db00..7da601702bb 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 685a98f6171..81c16387ca9 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)