=== GNUmakefile.in
==================================================================
--- GNUmakefile.in	(revision 14)
+++ GNUmakefile.in	(local)
@@ -23,7 +23,6 @@
 	$(MAKE) -C src $@
 
 install-all-headers:
-	$(MAKE) -C src $@
 
 # clean, distclean, etc should apply to contrib too, even though
 # it's not built by default
=== contrib/Makefile
==================================================================
--- contrib/Makefile	(revision 14)
+++ contrib/Makefile	(local)
@@ -14,7 +14,6 @@
 		dbmirror	\
 		dbsize		\
 		earthdistance	\
-		findoidjoins	\
 		fulltextindex	\
 		fuzzystrmatch	\
 		intagg		\
@@ -24,10 +23,7 @@
 		ltree		\
 		miscutil	\
 		noupdate	\
-		oid2name	\
-		pg_dumplo	\
 		pg_logger	\
-		pgbench		\
 		pgcrypto	\
 		pgstattuple	\
 		rserv		\
@@ -38,8 +34,7 @@
 		tablefunc	\
 		tips		\
 		tsearch		\
-		userlock	\
-		vacuumlo
+		userlock
 
 # Missing:
 #		ipc_check	\ (does not have a makefile)
=== src/Makefile
==================================================================
--- src/Makefile	(revision 14)
+++ src/Makefile	(local)
@@ -17,13 +17,10 @@
 	$(MAKE) -C port $@
 	$(MAKE) -C backend $@
 	$(MAKE) -C backend/utils/mb/conversion_procs $@
-	$(MAKE) -C include $@
-	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
 	$(MAKE) -C pl $@
 
 install-all-headers:
-	$(MAKE) -C include $@
 
 clean:
 	$(MAKE) -C port $@
=== src/Makefile.global.in
==================================================================
--- src/Makefile.global.in	(revision 14)
+++ src/Makefile.global.in	(local)
@@ -286,10 +286,10 @@
 libpq = -L$(libpq_builddir) -lpq
 
 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,9 +13,8 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS := initdb initlocation ipcclean pg_ctl pg_dump pg_id \
-	psql scripts pg_config pg_controldata pg_resetxlog \
-	pg_encoding
+DIRS := initdb initlocation ipcclean pg_ctl pg_id \
+	pg_controldata pg_resetxlog
 
 ifeq ($(with_tcl), yes)
 	DIRS += pgtclsh
=== src/include/pg_config.h.in
==================================================================
--- src/include/pg_config.h.in	(revision 14)
+++ src/include/pg_config.h.in	(local)
@@ -244,7 +244,7 @@
  * just hate the idea of sockets in /tmp, 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"
 
 
 /*