diff --git a/GNUmakefile.in b/GNUmakefile.in
index 16f9057..0f6cee7 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:
 	$(MAKE) -C doc $@
 	$(MAKE) -C src $@
-	$(MAKE) -C config $@
 
 distprep:
 	$(MAKE) -C doc $@
diff --git a/contrib/Makefile b/contrib/Makefile
index 1787a1b..6b4104d 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -18,19 +18,16 @@ WANTED_DIRS = \
 		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
diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
index ba864c1..1e2e96e 100644
--- a/contrib/adminpack/Makefile
+++ b/contrib/adminpack/Makefile
@@ -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
diff --git a/src/Makefile b/src/Makefile
index 6d9043a..ccf7ae7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,14 +18,11 @@ 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 test/regress $@
 
-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 820dfd5..2619acd 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -365,10 +365,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 0d86213..2779a41 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 1742eb8..21fd79f 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 installdirs
-	$(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a'
+install:
 
 installdirs:
 	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index f2319d2..85aac4f 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -148,7 +148,7 @@ all-spi:
 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
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 5daf28a..0d2a0a3 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -502,7 +502,7 @@ initialize_environment(void)
 		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 @@ main(int argc, char *argv[])
 		 */
 		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 */