diff --git a/GNUmakefile.in b/GNUmakefile.in index c451bd6..a048ce7 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 166ed86..c0705a7 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -13,7 +13,6 @@ WANTED_DIRS = \ dbmirror \ dbsize \ earthdistance \ - findoidjoins \ fulltextindex \ fuzzystrmatch \ intagg \ @@ -22,13 +21,8 @@ WANTED_DIRS = \ lo \ ltree \ miscutil \ - mysql \ noupdate \ - oid2name \ - pg_autovacuum \ - pg_dumplo \ pg_trgm \ - pgbench \ pgcrypto \ pgstattuple \ rtree_gist \ @@ -39,8 +33,7 @@ WANTED_DIRS = \ tips \ tsearch \ 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 e57265e..e081618 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -336,10 +336,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 de686e7..3bddb0e 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 822147b..f45ddee 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -138,7 +138,8 @@ 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) $(MAXCONNOPT) $(NOLOCALE) + chown portage testtablespace . + su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)" installcheck: all -rm -rf ./testtablespace diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index d62afdd..e41319c 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -89,6 +89,8 @@ host_platform='@host_tuple@' enable_shared='@enable_shared@' GCC=@GCC@ +test -z "${clientbindir}" && clientbindir="${bindir}" + if [ "$GCC" = yes ]; then compiler=gcc else @@ -446,7 +448,7 @@ then # wait forever, however. i=0 max=60 - until "$bindir/psql" -X $psql_options template1 /dev/null + until "$clientbindir/psql" -X $psql_options template1 /dev/null do i=`expr $i + 1` if [ $i -ge $max ] @@ -503,7 +505,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 @@ -512,7 +514,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" # ---------- @@ -546,13 +548,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 "\ checkpoint; alter database \"$dbname\" set lc_messages to 'C'; alter database \"$dbname\" set lc_monetary to 'C'; @@ -569,7 +571,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 @@ -582,7 +584,7 @@ fi if [ "$enable_shared" = yes ]; then message "installing PL/pgSQL" - "$bindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname + "$clientbindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname if [ $? -ne 0 ] && [ $? -ne 2 ]; then echo "$me: createlang failed" (exit 2); exit