mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a number of places where reconfiguring with a different installation

Browse Source 
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.
This commit is contained in:
Tom Lane 2003-12-23 21:56:21 +00:00
parent 358d032f98
commit cd2ad9b944
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/utils/fmgr/Makefile
View File

@ -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

6
src/bin/initdb/Makefile
View File

@ -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

4
src/bin/pg_ctl/Makefile
View File

@ -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' \

6
src/bin/pg_dump/Makefile
View File

@ -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

4
src/test/regress/GNUmakefile
View File

@ -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' \