1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 0216527..7ed3520 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
all:
$(MAKE) -C doc all
$(MAKE) -C src all
- $(MAKE) -C config all
@echo "All of PostgreSQL successfully made. Ready to install."
install:
$(MAKE) -C doc $@
$(MAKE) -C src $@
- $(MAKE) -C config $@
@echo "PostgreSQL installation complete."
installdirs uninstall distprep:
$(MAKE) -C doc $@
$(MAKE) -C src $@
- $(MAKE) -C config $@
# clean, distclean, etc should apply to contrib too, even though
# it's not built by default
diff --git a/contrib/Makefile b/contrib/Makefile
index 7367163..2740bb9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -19,10 +19,8 @@ WANTED_DIRS = \
isbn_issn \
lo \
ltree \
- oid2name \
pg_buffercache \
pg_trgm \
- pgbench \
pgcrypto \
pgstattuple \
seg \
@@ -30,8 +28,7 @@ WANTED_DIRS = \
tablefunc \
tips \
tsearch2 \
- userlock \
- vacuumlo
+ userlock
# Missing:
# adddepend \ (does not have a makefile)
diff --git a/src/Makefile b/src/Makefile
index 0963f88..5a7bb45 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,14 +18,10 @@ all install installdirs uninstall dep depend distprep:
$(MAKE) -C timezone $@
$(MAKE) -C backend $@
$(MAKE) -C backend/utils/mb/conversion_procs $@
- $(MAKE) -C include $@
- $(MAKE) -C interfaces $@
$(MAKE) -C bin $@
$(MAKE) -C pl $@
- $(MAKE) -C makefiles $@
- $(MAKE) -C utils $@
-install: install-local
+install:
install-local: installdirs-local
$(INSTALL_DATA) Makefile.global $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 20d7a1d..12533a2 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -360,10 +360,10 @@ endif
submake-libpq:
- $(MAKE) -C $(libpq_builddir) all
+ @true $(MAKE) -C $(libpq_builddir) all
submake-libpgport:
- $(MAKE) -C $(top_builddir)/src/port all
+ @true $(MAKE) -C $(top_builddir)/src/port all
.PHONY: submake-libpq submake-libpgport
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 8309db1..0d620d0 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -13,8 +13,8 @@ subdir = src/bin
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-DIRS := initdb ipcclean pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog
+DIRS := initdb ipcclean pg_ctl \
+ pg_controldata pg_resetxlog
ifeq ($(PORTNAME), win32)
DIRS+=pgevent
endif
diff --git a/src/port/Makefile b/src/port/Makefile
index 8ca565e..dad5bb3 100644
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -29,11 +29,10 @@ LIBS += $(PTHREAD_LIBS)
# Replace all object files so they use FRONTEND define
LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
-all: libpgport.a libpgport_srv.a
+all: libpgport_srv.a
# libpgport is needed by some contrib
-install: all
- $(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
+install:
uninstall:
$(RM) $(DESTDIR)$(libdir)/libpgport.a
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index a384254..22f69f1 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -137,7 +137,7 @@ all-spi:
check: all
-rm -rf ./testtablespace
mkdir ./testtablespace
- $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
+ clientbindir="/usr/lib/postgresql-${SLOT}/bin/" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
installcheck: all
-rm -rf ./testtablespace
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
index 5bb31f7..0223328 100644
--- a/src/test/regress/pg_regress.sh
+++ b/src/test/regress/pg_regress.sh
@@ -91,6 +91,8 @@ host_platform='@host_tuple@'
enable_shared='@enable_shared@'
GCC=@GCC@
+test -z "${clientbindir}" && clientbindir="${bindir}"
+
if [ "$GCC" = yes ]; then
compiler=gcc
else
@@ -441,7 +443,7 @@ then
# wait forever, however.
i=0
max=60
- until "$bindir/psql" -X $psql_options postgres </dev/null 2>/dev/null
+ until "$clientbindir/psql" -X $psql_options postgres </dev/null 2>/dev/null
do
i=`expr $i + 1`
if [ $i -ge $max ]
@@ -498,7 +500,7 @@ else # not temp-install
fi
message "dropping database \"$dbname\""
- "$bindir/dropdb" $psql_options "$dbname"
+ "$clientbindir/dropdb" $psql_options "$dbname"
# errors can be ignored
fi
@@ -507,7 +509,7 @@ fi
# Set up SQL shell for the test.
# ----------
-PSQL="$bindir/psql -a -q -X $psql_options"
+PSQL="$clientbindir/psql -a -q -X $psql_options"
# ----------
@@ -538,13 +540,13 @@ fi
# ----------
message "creating database \"$dbname\""
-"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
+"$clientbindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
if [ $? -ne 0 ]; then
echo "$me: createdb failed"
(exit 2); exit
fi
-"$bindir/psql" -q -X $psql_options -c "\
+"$clientbindir/psql" -q -X $psql_options -c "\
alter database \"$dbname\" set lc_messages to 'C';
alter database \"$dbname\" set lc_monetary to 'C';
alter database \"$dbname\" set lc_numeric to 'C';
@@ -560,7 +562,7 @@ fi
# ----------
message "dropping regression test user accounts"
-"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
+"$clientbindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
if [ $? -eq 2 ]; then
echo "$me: could not drop user accounts"
(exit 2); exit
@@ -575,7 +577,7 @@ if [ "$enable_shared" = yes ]; then
for lang in xyzzy $load_langs ; do
if [ "$lang" != "xyzzy" ]; then
message "installing $lang"
- "$bindir/createlang" $psql_options $lang $dbname
+ "$clientbindir/createlang" $psql_options $lang $dbname
if [ $? -ne 0 ] && [ $? -ne 2 ]; then
echo "$me: createlang $lang failed"
(exit 2); exit
|
GitWeb