=== GNUmakefile.in
==================================================================
--- GNUmakefile.in	(revision 14)
+++ GNUmakefile.in	(local)
@@ -11,19 +11,16 @@
 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:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 
 distprep:
 	$(MAKE) -C doc $@
=== contrib/Makefile
==================================================================
--- contrib/Makefile	(revision 14)
+++ contrib/Makefile	(local)
@@ -18,19 +18,16 @@
 		isn		\
 		lo		\
 		ltree		\
-		oid2name	\
 		pg_buffercache	\
 		pg_freespacemap \
 		pg_trgm		\
-		pgbench		\
 		pgcrypto	\
 		pgrowlocks	\
 		pgstattuple	\
 		seg		\
 		spi		\
 		tablefunc	\
-		tsearch2	\
-		vacuumlo
+		tsearch2
 
 ifeq ($(with_openssl),yes)
 WANTED_DIRS += sslinfo
=== contrib/adminpack/Makefile
==================================================================
--- contrib/adminpack/Makefile	(revision 14)
+++ contrib/adminpack/Makefile	(local)
@@ -1,5 +1,5 @@
 MODULE_big = adminpack
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
 DATA_built = adminpack.sql
 DATA = uninstall_adminpack.sql
 DOCS = README.adminpack
=== src/Makefile
==================================================================
--- src/Makefile	(revision 14)
+++ src/Makefile	(local)
@@ -18,14 +18,11 @@
 	$(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 test/regress $@
 
-install: install-local
+install:
 
 install-local: installdirs-local
 	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
=== src/Makefile.global.in
==================================================================
--- src/Makefile.global.in	(revision 14)
+++ src/Makefile.global.in	(local)
@@ -365,10 +365,10 @@
 
 
 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
 
=== src/bin/Makefile
==================================================================
--- src/bin/Makefile	(revision 14)
+++ src/bin/Makefile	(local)
@@ -13,8 +13,8 @@
 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
=== src/include/pg_config_manual.h
==================================================================
--- src/include/pg_config_manual.h	(revision 14)
+++ src/include/pg_config_manual.h	(local)
@@ -175,7 +175,7 @@
  * here's where to twiddle it.  You can also override this at runtime
  * with the postmaster's -k switch.
  */
-#define DEFAULT_PGSOCKET_DIR  "/tmp"
+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
 
 /*
  * The random() function is expected to yield values between 0 and
=== src/port/Makefile
==================================================================
--- src/port/Makefile	(revision 14)
+++ src/port/Makefile	(local)
@@ -29,11 +29,10 @@
 # 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 installdirs
-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+install:
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
=== src/test/regress/GNUmakefile
==================================================================
--- src/test/regress/GNUmakefile	(revision 14)
+++ src/test/regress/GNUmakefile	(local)
@@ -148,7 +148,7 @@
 check: all
 	-rm -rf ./testtablespace
 	mkdir ./testtablespace
-	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
+	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
 
 installcheck: all
 	-rm -rf ./testtablespace
=== src/test/regress/pg_regress.c
==================================================================
--- src/test/regress/pg_regress.c	(revision 14)
+++ src/test/regress/pg_regress.c	(local)
@@ -502,7 +502,7 @@
 		datadir = tmp;
 
 		/* psql will be installed into temp-install bindir */
-		psqldir = bindir;
+		/* psqldir = bindir; */
 
 		/*
 		 * Set up shared library paths to include the temp install.
@@ -1535,7 +1535,7 @@
 		 */
 		snprintf(buf, sizeof(buf),
 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
-				 bindir, DEVNULL, DEVNULL);
+				 psqldir, DEVNULL, DEVNULL);
 		for (i = 0; i < 60; i++)
 		{
 			/* Done if psql succeeds */