]> granicus.if.org Git - postgis/commitdiff
applied patch from Mark to fix the if/then/else so the Makefile can run on older...
authorKevin Neufeld <kneufeld.ca@gmail.com>
Tue, 15 Jul 2008 15:33:19 +0000 (15:33 +0000)
committerKevin Neufeld <kneufeld.ca@gmail.com>
Tue, 15 Jul 2008 15:33:19 +0000 (15:33 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@2853 b70326c6-7e19-0410-871a-916f4a2858ee

doc/Makefile.in

index fd8fe81fd80491ecf1ec382ba76789ca45832f5d..0528e133bcfa1c8509140f25d04802f0abce2087 100644 (file)
@@ -26,22 +26,23 @@ XSLTPROC_COMMONOPTS = \
 XSLTPROC_HTMLOPTS = \
        --stringparam html.stylesheet style.css \
 
-HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl 
-CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl 
+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 or XSLBASE were not found during configure, we cannot
-# build the documentation
-ifndef XSLTPROC
-all: requirements_not_met_xsltproc
-else ifndef XSLBASE
-all: requirements_not_met_xslbase 
-else
-all: html/postgis.html
+# If XSLTPROC or XSLBASE were not found during configure, we cannot\r
+# build the documentation\r
+ifeq ($(XSLTPROC),)\r
+all: requirements_not_met_xsltproc\r
+else \r
+ifeq ($(XSLBASE),)\r
+all: requirements_not_met_xslbase \r
+else\r
+all: html/postgis.html\r
+endif\r
 endif
 
 postgis-out.xml: postgis.xml introduction.xml installation.xml faq.xml using_postgis.xml performance_tips.xml reference.xml reference_new.xml reporting.xml release_notes.xml ../Version.config
@@ -105,4 +106,4 @@ requirements_not_met_xslbase:
        @echo
 
 .PHONY: html
+