Commit cd2ad9b9 authored by Tom Lane's avatar Tom Lane

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.
parent 358d032f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils/fmgr # Makefile for utils/fmgr
# #
# IDENTIFICATION # 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) ...@@ -24,3 +24,7 @@ SUBSYS.o: $(OBJS)
clean: clean:
rm -f SUBSYS.o $(OBJS) rm -f SUBSYS.o $(OBJS)
# ensure that changes in PKGLIBDIR propagate to dfmgr.o
dfmgr.o: dfmgr.c $(top_builddir)/src/Makefile.global
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # 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: ...@@ -33,3 +33,7 @@ uninstall:
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f initdb$(X) $(OBJS) rm -f initdb$(X) $(OBJS)
# ensure that changes in bindir etc. propagate into object file
initdb.o: initdb.c $(top_builddir)/src/Makefile.global
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1999, PostgreSQL Global Development Group # 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 ...@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
all: pg_ctl all: pg_ctl
pg_ctl: pg_ctl.sh pg_ctl: pg_ctl.sh $(top_builddir)/src/Makefile.global
sed -e 's/@VERSION@/$(VERSION)/g' \ sed -e 's/@VERSION@/$(VERSION)/g' \
-e 's,@bindir@,$(bindir),g' \ -e 's,@bindir@,$(bindir),g' \
-e 's,@DEF_PGPORT@,$(DEF_PGPORT),g' \ -e 's,@DEF_PGPORT@,$(DEF_PGPORT),g' \
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # 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: ...@@ -51,3 +51,7 @@ uninstall:
clean distclean maintainer-clean: 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 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
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # 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 ...@@ -40,7 +40,7 @@ endif
all: pg_regress 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' \ sed -e 's,@bindir@,$(bindir),g' \
-e 's,@libdir@,$(libdir),g' \ -e 's,@libdir@,$(libdir),g' \
-e 's,@pkglibdir@,$(pkglibdir),g' \ -e 's,@pkglibdir@,$(pkglibdir),g' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment