diff -Naur a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile	2011-01-27 21:24:47.000000000 -0500
+++ b/contrib/Makefile	2011-03-20 17:08:14.354083541 -0400
@@ -5,41 +5,10 @@
 include $(top_builddir)/src/Makefile.global
 
 WANTED_DIRS = \
-		adminpack	\
-		btree_gist	\
-		chkpass		\
-		cube		\
-		dblink		\
-		dict_int	\
-		dict_xsyn	\
-		earthdistance	\
-		fuzzystrmatch	\
-		hstore		\
-		intagg		\
-		intarray	\
-		isn		\
-		lo		\
-		ltree		\
 		oid2name	\
-		pageinspect	\
-		pg_buffercache	\
-		pg_freespacemap \
-		pg_standby	\
-		pg_trgm		\
 		pgbench		\
-		pgcrypto	\
-		pgrowlocks	\
-		pgstattuple	\
-		seg		\
-		spi		\
-		tablefunc	\
-		test_parser	\
-		tsearch2	\
 		vacuumlo
 
-ifeq ($(with_openssl),yes)
-WANTED_DIRS += sslinfo
-endif
 
 ifeq ($(with_ossp_uuid),yes)
 WANTED_DIRS += uuid-ossp
diff -Naur a/src/Makefile b/src/Makefile
--- a/src/Makefile	2011-01-27 21:24:47.000000000 -0500
+++ b/src/Makefile	2011-03-20 17:10:04.114083541 -0400
@@ -15,16 +15,11 @@
 
 all install installdirs uninstall distprep:
 	$(MAKE) -C port $@
-	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
-	$(MAKE) -C backend/utils/mb/conversion_procs $@
-	$(MAKE) -C backend/snowball $@
 	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
-	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
-	$(MAKE) -C test/regress $@
 
 install: install-local
 
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
--- a/src/backend/Makefile	2011-01-27 21:24:47.000000000 -0500
+++ b/src/backend/Makefile	2011-03-20 17:14:21.617388542 -0400
@@ -34,7 +34,7 @@
 
 ##########################################################################
 
-all: submake-libpgport postgres $(POSTGRES_IMP)
+all: someheaders
 
 ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
@@ -107,8 +107,7 @@
 
 .PHONY: $(DIRS:%=%-recursive)
 # Update the commonly used headers before building the subdirectories
-$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
-	$(MAKE) -C $(subst -recursive,,$@) all
+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
 
 
 # The postgres.o target is needed by the rule in Makefile.global that
@@ -155,23 +154,7 @@
 
 ##########################################################################
 
-install: all installdirs install-bin
-ifeq ($(PORTNAME), cygwin)
-ifeq ($(MAKE_DLL), true)
-	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
-ifeq ($(PORTNAME), win32)
-ifeq ($(MAKE_DLL), true)
-	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
-	$(MAKE) -C catalog install-data
-	$(MAKE) -C tsearch install-data
-	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
-	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
-	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
-	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
+install:
 
 install-bin: postgres $(POSTGRES_IMP) installdirs
 	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile	2011-01-27 21:24:47.000000000 -0500
+++ b/src/bin/Makefile	2011-03-20 17:16:38.931158541 -0400
@@ -13,8 +13,7 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS = initdb ipcclean pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog
+DIRS = pg_dump psql scripts pg_config
 ifeq ($(PORTNAME), win32)
 DIRS+=pgevent
 endif
diff -Naur a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
--- a/src/include/pg_config_manual.h	2011-01-27 21:24:47.000000000 -0500
+++ b/src/include/pg_config_manual.h	2011-03-20 17:17:51.151158541 -0400
@@ -184,7 +184,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  "@GENTOO_PORTAGE_EPREFIX@/run/postgresql"
 
 /*
  * The random() function is expected to yield values between 0 and