Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcd2ad9b

Browse files
committed
Fix a number of places where reconfiguring with a different installation
prefix would fail, because the new path did not get propagated to whereit needed to be. Note this would fail even with --enable-depend.
1 parent358d032 commitcd2ad9b

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

‎src/backend/utils/fmgr/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils/fmgr
55
#
66
# 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 $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -24,3 +24,7 @@ SUBSYS.o: $(OBJS)
2424

2525
clean:
2626
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

‎src/bin/initdb/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
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 $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -33,3 +33,7 @@ uninstall:
3333

3434
cleandistcleanmaintainer-clean:
3535
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

‎src/bin/pg_ctl/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1999, PostgreSQL Global Development Group
66
#
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 $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
all: pg_ctl
1616

17-
pg_ctl: pg_ctl.sh
17+
pg_ctl: pg_ctl.sh$(top_builddir)/src/Makefile.global
1818
sed -e's/@VERSION@/$(VERSION)/g'\
1919
-e's,@bindir@,$(bindir),g'\
2020
-e's,@DEF_PGPORT@,$(DEF_PGPORT),g'\

‎src/bin/pg_dump/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
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 $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -51,3 +51,7 @@ uninstall:
5151

5252
cleandistcleanmaintainer-clean:
5353
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

‎src/test/regress/GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# 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 $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -40,7 +40,7 @@ endif
4040

4141
all: pg_regress
4242

43-
pg_regress: pg_regress.sh GNUmakefile
43+
pg_regress: pg_regress.sh GNUmakefile$(top_builddir)/src/Makefile.global
4444
sed -e's,@bindir@,$(bindir),g'\
4545
-e's,@libdir@,$(libdir),g'\
4646
-e's,@pkglibdir@,$(pkglibdir),g'\

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp