Add subdirectory support for DATA/DOCS with PGXS - Mailing list pgsql-hackers

Hi all,

Since moving PostGIS over to PGXS for the 1.4 release, we've been
looking at how we can support multiple versions of PostGIS being
installed in different databases within the same cluster.

We are able to version the .so file produced by PGXS without too much
difficulty, however PGXS in its current form does not have the ability
to install different versions of the DATA or DOCS files within the same
installation.

The attached patch is a prototype which allows the user to specify a new
MODULEDIR variable in a module makefile which, if specified, will
install DATA and DOCS items in contrib/$(MODULEDIR) rather than just
contrib. If MODULEDIR is left unspecified, the files will simply be
stored directly in contrib/ as before.

In my current development setup here, the head of the new PostGIS PGXS
Makefile now looks like this:


MODULE_big=postgis-1.5
MODULEDIR=$(MODULE_big)
...
...


With this patch in place, "make install" on the PGXS will correctly
install the DATA and DOCS files in versioned directories and therefore
allow multiple installations within the same database cluster.

The coding within the Makefile isn't too difficult in its current form,
but I'd be interested to get some initial feedback as to whether the
introduction of a new MODULEDIR variable is the best way to add this new
piece of functionality.


Many thanks,

Mark.

--
Mark Cave-Ayland - Senior Technical Architect
PostgreSQL - PostGIS
Sirius Corporation plc - control through freedom
http://www.siriusit.co.uk
t: +44 870 608 0063

Sirius Labs: http://www.siriusit.co.uk/labs
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index a83dad3..4e17e8a 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -19,8 +19,11 @@
 #
 #   MODULES -- list of shared objects to be build from source file with
 #     same stem (do not include suffix in this list)
-#   DATA -- random files to install into $PREFIX/share/contrib
-#   DATA_built -- random files to install into $PREFIX/share/contrib,
+#   MODULEDIR -- subdirectory under contrib into which DATA and DOCS are
+#     installed (if not set, DATA and DOCS files are installed directly
+#     under the contrib/ directory)
+#   DATA -- random files to install into $PREFIX/share/contrib/$MODULEDIR
+#   DATA_built -- random files to install into $PREFIX/share/contrib/$MODULEDIR,
 #     which need to be built first
 #   DATA_TSEARCH -- random files to install into $PREFIX/share/tsearch_data
 #   DOCS -- random files to install under $PREFIX/doc/contrib
@@ -86,12 +89,16 @@ include $(top_srcdir)/src/Makefile.shlib
 all: all-lib
 endif # MODULE_big

+ifdef MODULEDIR
+moduledir = /$(MODULEDIR)
+endif
+

 install: all installdirs
 ifneq (,$(DATA)$(DATA_built))
     @for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
-      echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \
-      $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'; \
+      echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib$(moduledir)'"; \
+      $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib$(moduledir)'; \
     done
 endif # DATA
 ifneq (,$(DATA_TSEARCH))
@@ -109,8 +116,8 @@ endif # MODULES
 ifdef DOCS
 ifdef docdir
     @for file in $(addprefix $(srcdir)/, $(DOCS)); do \
-      echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'"; \
-      $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'; \
+      echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib$(moduledir)'"; \
+      $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib$(moduledir)'; \
     done
 endif # docdir
 endif # DOCS
@@ -137,7 +144,7 @@ endif # MODULE_big

 installdirs:
 ifneq (,$(DATA)$(DATA_built))
-    $(MKDIR_P) '$(DESTDIR)$(datadir)/contrib'
+    $(MKDIR_P) '$(DESTDIR)$(datadir)/contrib$(moduledir)'
 endif
 ifneq (,$(DATA_TSEARCH))
     $(MKDIR_P) '$(DESTDIR)$(datadir)/tsearch_data'
@@ -147,7 +154,7 @@ ifneq (,$(MODULES))
 endif
 ifdef DOCS
 ifdef docdir
-    $(MKDIR_P) '$(DESTDIR)$(docdir)/contrib'
+    $(MKDIR_P) '$(DESTDIR)$(docdir)/contrib$(moduledir)'
 endif # docdir
 endif # DOCS
 ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built))
@@ -161,7 +168,7 @@ endif # MODULE_big

 uninstall:
 ifneq (,$(DATA)$(DATA_built))
-    rm -f $(addprefix '$(DESTDIR)$(datadir)'/contrib/, $(notdir $(DATA) $(DATA_built)))
+    rm -f $(addprefix '$(DESTDIR)$(datadir)'/contrib$(moduledir)/, $(notdir $(DATA) $(DATA_built)))
 endif
 ifneq (,$(DATA_TSEARCH))
     rm -f $(addprefix '$(DESTDIR)$(datadir)'/tsearch_data/, $(notdir $(DATA_TSEARCH)))
@@ -170,7 +177,7 @@ ifdef MODULES
     rm -f $(addprefix '$(DESTDIR)$(pkglibdir)'/, $(addsuffix $(DLSUFFIX), $(MODULES)))
 endif
 ifdef DOCS
-    rm -f $(addprefix '$(DESTDIR)$(docdir)'/contrib/, $(DOCS))
+    rm -f $(addprefix '$(DESTDIR)$(docdir)'/contrib$(moduledir)/, $(DOCS))
 endif
 ifdef PROGRAM
     rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)'