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

Commit1719fd5

Browse files
committed
Fix some problems exposed by building outside the source tree.
1 parent1426db5 commit1719fd5

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

‎src/bin/scripts/Makefile‎

Lines changed: 5 additions & 10 deletions
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-
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.19 2003/03/18 22:19:46 petere Exp $
8+
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.20 2003/04/16 05:23:55 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -16,7 +16,7 @@ include $(top_builddir)/src/Makefile.global
1616
SCRIPTS := vacuumdb clusterdb
1717
PROGRAMS = createdb createlang createuser dropdb droplang dropuser
1818

19-
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)
19+
overrideCPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir)$(CPPFLAGS)
2020

2121

2222
all: submake-libpq submake-backend$(PROGRAMS)
@@ -31,15 +31,10 @@ dropdb: dropdb.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/pars
3131
droplang: droplang.o common.o sprompt.o print.o mbprint.o
3232
dropuser: dropuser.o common.o dumputils.o sprompt.o$(top_builddir)/src/backend/parser/keywords.o
3333

34-
createdb.ocreateuser.odropdb.odropuser.odumputils.o: dumputils.h
35-
36-
createlang.odroplang.o: print.h
37-
print.o: print.h mbprint.h
38-
39-
dumputils.cdumputils.hsprompt.c :% :$(top_srcdir)/src/bin/pg_dump/%
34+
dumputils.csprompt.c :% :$(top_srcdir)/src/bin/pg_dump/%
4035
rm -f$@&&$(LN_S)$<.
4136

42-
print.cprint.hmbprint.cmbprint.h :% :$(top_srcdir)/src/bin/psql/%
37+
print.cmbprint.c :% :$(top_srcdir)/src/bin/psql/%
4338
rm -f$@&&$(LN_S)$<.
4439

4540
.PHONY: submake-backend
@@ -65,4 +60,4 @@ uninstall:
6560

6661

6762
cleandistcleanmaintainer-clean:
68-
rm -f$(addsuffix$(X),$(PROGRAMS))$(addsuffix .o,$(PROGRAMS)) common.o dumputils.o sprompt.o print.o mbprint.o dumputils.cdumputils.hsprompt.c print.cprint.hmbprint.c mbprint.h
63+
rm -f$(addsuffix$(X),$(PROGRAMS))$(addsuffix .o,$(PROGRAMS)) common.o dumputils.o sprompt.o print.o mbprint.o dumputils.c sprompt.c print.c mbprint.c

‎src/interfaces/ecpg/compatlib/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.2 2003/04/08 17:08:15 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.3 2003/04/16 05:23:55 tgl Exp $
88
#
99
#-------------------------------------------------------------------------
1010

11-
subdir = src/interfaces/ecpg/pgtypeslib
11+
subdir = src/interfaces/ecpg/compatlib
1212
top_builddir = ../../../..
1313
include$(top_builddir)/src/Makefile.global
1414

0 commit comments

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