please find attached an alternate submission which addresses open item

"make pgxs install by default". It is up to the committers to chose.

(1) there is only one "install" target. no more "install-all-headers".
    it simplifies/changes several makefiles.

(2) the documentation reflects the change.

(3) a minor fix on pgxs to use a nicer patch without a double slash.

Fabien Coelho

4 files changed, 14 insertions, 27 deletions

diff --git a/src/Makefile b/src/Makefile
index 8b40788e930..2b0bea0ff80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.34 2004/08/20 20:13:10 momjian Exp $
+# $PostgreSQL: pgsql/src/Makefile,v 1.35 2004/10/06 08:49:59 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,10 +33,6 @@ install-local: installdirs-local
 	$(INSTALL_DATA) $(srcdir)/Makefile.shlib $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.shlib
 	$(INSTALL_DATA) $(srcdir)/nls-global.mk $(DESTDIR)$(pgxsdir)/$(subdir)/nls-global.mk
 
-install-all-headers:
-	$(MAKE) -C include $@
-	$(MAKE) -C port $@
-
 installdirs: installdirs-local
 
 installdirs-local:
diff --git a/src/include/Makefile b/src/include/Makefile
index cfd4c3637f5..8846d1b4086 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -2,11 +2,9 @@
 #
 # Makefile for src/include
 #
-# 'make install' installs only those headers needed for client-side
-# programming.  'make install-all-headers' installs the whole contents
-# of src/include.
+# 'make install' installs whole contents of src/include.
 #
-# $PostgreSQL: pgsql/src/include/Makefile,v 1.12 2003/11/29 19:52:08 pgsql Exp $
+# $PostgreSQL: pgsql/src/include/Makefile,v 1.13 2004/10/06 08:50:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,8 +16,11 @@ include $(top_builddir)/src/Makefile.global
 all: pg_config.h pg_config_os.h
 
 
-# Install only selected headers
+# Subdirectories containing headers for server-side dev
+SUBDIRS = access bootstrap catalog commands executor lib libpq mb \
+	nodes optimizer parser port regex rewrite storage tcop utils
 
+# Install all headers
 install: all installdirs remove-old-headers
 # These headers are needed by the public headers of the interfaces.
 	$(INSTALL_DATA) $(srcdir)/postgres_ext.h   $(DESTDIR)$(includedir)
@@ -33,18 +34,7 @@ install: all installdirs remove-old-headers
 	$(INSTALL_DATA) $(srcdir)/postgres_fe.h  $(DESTDIR)$(includedir_internal)
 	$(INSTALL_DATA) $(srcdir)/libpq/pqcomm.h $(DESTDIR)$(includedir_internal)/libpq
 	$(INSTALL_DATA) $(srcdir)/lib/dllist.h   $(DESTDIR)$(includedir_internal)/lib
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/libpq $(DESTDIR)$(includedir_internal)/libpq $(DESTDIR)$(includedir_internal)/lib
-
-
-# Install all headers
-
-# Subdirectories containing headers that install-all-headers should install
-SUBDIRS = access bootstrap catalog commands executor lib libpq mb \
-	nodes optimizer parser port regex rewrite storage tcop utils
-
-install-all-headers: all install-all-dirs
+# These headers are needed for server-side development
 	$(INSTALL_DATA) pg_config.h    $(DESTDIR)$(includedir_server)
 	$(INSTALL_DATA) pg_config_os.h $(DESTDIR)$(includedir_server)
 	for file in $(srcdir)/*.h; do \
@@ -56,7 +46,8 @@ install-all-headers: all install-all-dirs
 	  done \
 	done
 
-install-all-dirs:
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/libpq $(DESTDIR)$(includedir_internal)/libpq $(DESTDIR)$(includedir_internal)/lib
 	$(mkinstalldirs) $(addprefix $(DESTDIR)$(includedir_server)/, $(SUBDIRS))
 
 
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 1ca974c3ed4..cce70606039 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -1,6 +1,6 @@
 # PGXS: PostgreSQL extensions makefile
 
-# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.1 2004/07/30 12:26:40 petere Exp $ 
+# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.2 2004/10/06 08:50:02 momjian Exp $ 
 
 # This file contains generic rules to build many kinds of simple
 # extension modules.  You only need to set a few variables and include
@@ -50,7 +50,7 @@ endif
 
 ifdef PGXS
 # We assume that we are in src/makefiles/, so top is ...
-top_builddir := $(dir $(PGXS))/../..
+top_builddir := $(dir $(PGXS))../..
 include $(top_builddir)/src/Makefile.global
 
 top_srcdir = $(top_builddir)
diff --git a/src/port/Makefile b/src/port/Makefile
index c9c66b9129f..7a01fbc3fb5 100644
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -15,7 +15,7 @@
 #		for use only by the backend binaries
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/port/Makefile,v 1.19 2004/10/04 13:43:58 momjian Exp $
+#    $PostgreSQL: pgsql/src/port/Makefile,v 1.20 2004/10/06 08:50:02 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -36,7 +36,7 @@ LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))
 all: libpgport.a libpgport_srv.a
 
 # libpgport is needed by some contrib
-install-all-headers: 
+install:
 	$(INSTALL_STLIB) libpgport.a $(DESTDIR)$(libdir)
 
 uninstall: