Fix a number of places where reconfiguring with a different installation

prefix would fail, because the new path did not get propagated to where
it needed to be.  Note this would fail even with --enable-depend.

5 files changed, 19 insertions, 7 deletions

diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
index 6ea81807112..000b17a21d5 100644
--- a/src/backend/utils/fmgr/Makefile
+++ b/src/backend/utils/fmgr/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.14 2003/11/29 19:52:01 pgsql Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.15 2003/12/23 21:56:20 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -24,3 +24,7 @@ SUBSYS.o: $(OBJS)
 
 clean: 
 	rm -f SUBSYS.o $(OBJS)
+
+
+# ensure that changes in PKGLIBDIR propagate to dfmgr.o
+dfmgr.o: dfmgr.c $(top_builddir)/src/Makefile.global
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 45ffd335988..4fc92296a03 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.34 2003/11/29 19:52:04 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.35 2003/12/23 21:56:20 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,3 +33,7 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f initdb$(X) $(OBJS)
+
+
+# ensure that changes in bindir etc. propagate into object file
+initdb.o: initdb.c $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index 0aa8b322544..ce541c9d007 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1999, PostgreSQL Global Development Group
 #
-# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.12 2003/11/29 19:52:04 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.13 2003/12/23 21:56:21 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 all: pg_ctl
 
-pg_ctl: pg_ctl.sh
+pg_ctl: pg_ctl.sh $(top_builddir)/src/Makefile.global
 	sed -e 's/@VERSION@/$(VERSION)/g' \
 	    -e 's,@bindir@,$(bindir),g' \
 	    -e 's,@DEF_PGPORT@,$(DEF_PGPORT),g' \
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 5e36f7f0827..f345899f96a 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.42 2003/12/06 03:00:11 tgl Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.43 2003/12/23 21:56:21 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -51,3 +51,7 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o
+
+
+# ensure that changes in bindir etc. propagate into object file
+pg_dumpall.o: pg_dumpall.c $(top_builddir)/src/Makefile.global
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 5ad80b3470a..4a3942bc383 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.44 2003/11/29 19:52:14 pgsql Exp $
+#    $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.45 2003/12/23 21:56:21 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -40,7 +40,7 @@ endif
 
 all: pg_regress
 
-pg_regress: pg_regress.sh GNUmakefile
+pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global
 	sed -e 's,@bindir@,$(bindir),g' \
 	    -e 's,@libdir@,$(libdir),g' \
 	    -e 's,@pkglibdir@,$(pkglibdir),g' \