[postgis-commits] svn - r2780 - in trunk: . doc

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-05-22 07:34:32 -0700 (Thu, 22 May 2008)
New Revision: 2780

Modified:
   trunk/configure.in
   trunk/doc/Makefile.in
Log:
Update documentation build so that "make install" now works. Maybe this will fix the on-line website build?

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-05-22 14:31:02 UTC (rev 2779)
+++ trunk/configure.in	2008-05-22 14:34:32 UTC (rev 2780)
@@ -119,7 +119,14 @@
 AC_SUBST([PGSQL_FE_LDFLAGS])
 AC_SUBST([PGSQL_FE_CPPFLAGS])
 
+dnl Extract the documentation and man page directories
+PGSQL_DOCDIR=`$PGCONFIG --docdir`
+PGSQL_MANDIR=`$PGCONFIG --mandir`
 
+AC_SUBST([PGSQL_DOCDIR])
+AC_SUBST([PGSQL_MANDIR])
+
+
 dnl Ensure that we can parse libpq-fe.h
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$PGSQL_FE_CPPFLAGS"

Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in	2008-05-22 14:31:02 UTC (rev 2779)
+++ trunk/doc/Makefile.in	2008-05-22 14:34:32 UTC (rev 2780)
@@ -1,6 +1,13 @@
 #
 # PostGIS documentation build Makefile
 #
+# Written by Mark Cave-Ayland
+#
+# NOTE: We don't use a standard PGXS Makefile here since the DOCS target
+# only allows files to be stored within contrib/ and we currently
+# store documentation under contrib/postgis due to the possibility
+# that we could produce a large number of files (think chunked HTML)
+#
 
 XSLTPROC = @XSLTPROC@
 XSLBASE = @XSLBASE@
@@ -16,7 +23,11 @@
 HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl 
 CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl 
 
+# Directories for documentation and man pages
+PGSQL_DOCDIR=@PGSQL_DOCDIR@
+PGSQL_MANDIR=@PGSQL_MANDIR@
 
+
 # If XSLTPROC was not found during configure, we cannot
 # build the documentation
 ifdef XSLTPROC
@@ -55,18 +66,18 @@
 	@rm -f html/*.html
 
 install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1
-	@mkdir -p $(DESTDIR)$(docdir)/postgis
-	@mkdir -p $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) html/postgis.html $(DESTDIR)$(docdir)/postgis/postgis.html
-	$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/postgis/README.postgis
-	$(INSTALL_DATA) man/pgsql2shp.1 $(DESTDIR)$(mandir)/man1/pgsql2shp.1
-	$(INSTALL_DATA) man/shp2pgsql.1 $(DESTDIR)$(mandir)/man1/shp2pgsql.1
+	@mkdir -p $(PGSQL_DOCDIR)/postgis
+	@mkdir -p $(PGSQL_MANDIR)/man1
+	cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html
+	cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis
+	cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1
+	cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1
 
 uninstall:
-	rm -f $(DESTDIR)$(docdir)/postgis/postgis.html
-	rm -f $(DESTDIR)$(docdir)/postgis/README.postgis
-	rm -f $(DESTDIR)$(mandir)/man1/shp2pgsql.1
-	rm -f $(DESTDIR)$(mandir)/man1/pgsql2shp.1
+	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html
+	rm -f $(PGSQL_DOCDIR)/postgis/README.postgis
+	rm -f $(PGSQL_MANDIR)/man1/shp2pgsql.1
+	rm -f $(PGSQL_MANDIR)/man1/pgsql2shp.1
 
 requirements_not_met:
 	@echo