[postgis-commits] svn - r2568 - in trunk: . extras/template_gis

[postgis-commits at postgis.refractions.net]

Author: strk
Date: 2007-01-04 16:52:57 -0800 (Thu, 04 Jan 2007)
New Revision: 2568

Modified:
   trunk/ChangeLog
   trunk/GNUmakefile
   trunk/extras/template_gis/Makefile
Log:
        * GNUmakefile: bring in extra/template_gis for all rules.
        * extras/template_gis/Makefile: have 'install' also install manuals.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-01-03 17:28:03 UTC (rev 2567)
+++ trunk/ChangeLog	2007-01-05 00:52:57 UTC (rev 2568)
@@ -1,3 +1,8 @@
+2007-01-05 Sandro Santilli <strk at refractions.net>
+
+	* GNUmakefile: bring in extra/template_gis for all rules.
+	* extras/template_gis/Makefile: have 'install' also install manuals.
+
 2006-12-29 Sandro Santilli <strk at refractions.net>
 
 	* configure.in: fixed GEOS_LDFLAGS detection

Modified: trunk/GNUmakefile
===================================================================
--- trunk/GNUmakefile	2007-01-03 17:28:03 UTC (rev 2567)
+++ trunk/GNUmakefile	2007-01-05 00:52:57 UTC (rev 2568)
@@ -4,13 +4,13 @@
 #
 #-----------------------------------------------------
 
-all: Makefile.config liblwgeom loaderdumper utils 
+all: Makefile.config liblwgeom loaderdumper utils templategis
 
-install: all liblwgeom-install loaderdumper-install 
+install: all liblwgeom-install loaderdumper-install templategis-install
 
-uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall
+uninstall: liblwgeom-uninstall loaderdumper-uninstall docs-uninstall templategis-uninstall
 
-clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean 
+clean: Makefile.config liblwgeom-clean loaderdumper-clean docs-clean test-clean templategis-clean
 	rm -f lwpostgis.sql lwpostgis_upgrade.sql
 
 distclean: clean
@@ -59,6 +59,18 @@
 loaderdumper-uninstall:
 	$(MAKE) -C loader uninstall
 
+templategis: Makefile.config
+	$(MAKE) -C extras/template_gis
+
+templategis-clean:
+	$(MAKE) -C extras/template_gis clean
+
+templategis-install:
+	$(MAKE) -C extras/template_gis install
+
+templategis-uninstall:
+	$(MAKE) -C extras/template_gis uninstall
+
 docs: Makefile.config
 	$(MAKE) -C doc 
 

Modified: trunk/extras/template_gis/Makefile
===================================================================
--- trunk/extras/template_gis/Makefile	2007-01-03 17:28:03 UTC (rev 2567)
+++ trunk/extras/template_gis/Makefile	2007-01-05 00:52:57 UTC (rev 2568)
@@ -23,6 +23,14 @@
               $(LN_S) $(SCRIPT_TARGET) $(SCRIPT_LINKDIR)
 SCRIPT_UNINSTALL=rm -f $(SCRIPT_TARGET)
 SCRIPT_UNLINK=rm -f $(SCRIPT_LINK)
+
+# would probably be nice to link these somewhere as well
+MANPAGES1:=$(wildcard *.1)
+MAN1_TARGETDIR=$(DESTDIR)$(mandir)/man1
+MAN1_TARGET=$(MAN1_TARGETDIR)/$(MAN1)
+MAN1_INSTALL=$(INSTALL_DATA) $(MAN1) $(MAN1_TARGET)
+MAN1_UNINSTALL=rm -f $(MAN1_TARGET)
+
 DEFAULTS_DIR=$(DESTDIR)/etc/default
 SCRIPT_DEFAULTS=$(DEFAULTS_DIR)/postgis
 
@@ -37,10 +45,13 @@
 	@mkdir -p $(DEFAULTS_DIR)
 	cp profile $(SCRIPT_DEFAULTS)
 	rm -f $(SCRIPT_TARGETDIR)/profile
+	@mkdir -p $(MAN1_TARGETDIR)
+	$(foreach MAN1, $(MANPAGES1), $(MAN1_INSTALL);)
 
 uninstall:
 	$(foreach SCRIPT, $(PUBLIC_SCRIPTS), $(SCRIPT_UNLINK);)
 	$(foreach SCRIPT, $(SCRIPTS), $(SCRIPT_UNINSTALL);)
+	$(foreach MAN1, $(MANPAGES1), $(MAN1_UNINSTALL);)
 
 purge: uninstall
 	rm -f $(SCRIPT_DEFAULTS)