Fix a number of places where reconfiguring with a different installation

tglsfdc · tglsfdc · commit cd2ad9b944fb · 2003-12-23T21:56:21.000Z
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.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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' \

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# Makefile for utils/fmgr`
`5`	`5`	`#`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.14 2003/11/29 19:52:01 pgsql Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.15 2003/12/23 21:56:20 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -24,3 +24,7 @@ SUBSYS.o: $(OBJS)`
`24`	`24`
`25`	`25`	`clean:`
`26`	`26`	`rm -f SUBSYS.o $(OBJS)`
	`27`	`+`
	`28`	`+`
	`29`	`+# ensure that changes in PKGLIBDIR propagate to dfmgr.o`
	`30`	`+dfmgr.o: dfmgr.c $(top_builddir)/src/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.34 2003/11/29 19:52:04 pgsql Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.35 2003/12/23 21:56:20 tgl Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -33,3 +33,7 @@ uninstall:`
`33`	`33`
`34`	`34`	`clean distclean maintainer-clean:`
`35`	`35`	`rm -f initdb$(X) $(OBJS)`
	`36`	`+`
	`37`	`+`
	`38`	`+# ensure that changes in bindir etc. propagate into object file`
	`39`	`+initdb.o: initdb.c $(top_builddir)/src/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1999, PostgreSQL Global Development Group`
`6`	`6`	`#`
`7`		`-# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.12 2003/11/29 19:52:04 pgsql Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.13 2003/12/23 21:56:21 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global`
`14`	`14`
`15`	`15`	`all: pg_ctl`
`16`	`16`
`17`		`-pg_ctl: pg_ctl.sh`
	`17`	`+pg_ctl: pg_ctl.sh $(top_builddir)/src/Makefile.global`
`18`	`18`	`sed -e 's/@VERSION@/$(VERSION)/g' \`
`19`	`19`	`-e 's,@bindir@,$(bindir),g' \`
`20`	`20`	`-e 's,@DEF_PGPORT@,$(DEF_PGPORT),g' \`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.42 2003/12/06 03:00:11 tgl Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.43 2003/12/23 21:56:21 tgl Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -51,3 +51,7 @@ uninstall:`
`51`	`51`
`52`	`52`	`clean distclean maintainer-clean:`
`53`	`53`	`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`
	`54`	`+`
	`55`	`+`
	`56`	`+# ensure that changes in bindir etc. propagate into object file`
	`57`	`+pg_dumpall.o: pg_dumpall.c $(top_builddir)/src/Makefile.global`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.44 2003/11/29 19:52:14 pgsql Exp $`
	`10`	`+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.45 2003/12/23 21:56:21 tgl Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -40,7 +40,7 @@ endif`
`40`	`40`
`41`	`41`	`all: pg_regress`
`42`	`42`
`43`		`-pg_regress: pg_regress.sh GNUmakefile`
	`43`	`+pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global`
`44`	`44`	`sed -e 's,@bindir@,$(bindir),g' \`
`45`	`45`	`-e 's,@libdir@,$(libdir),g' \`
`46`	`46`	`-e 's,@pkglibdir@,$(pkglibdir),g' \`