[Scummvm-cvs-logs] SF.net SVN: scummvm: [25019] docs/trunk/docbook

[fingolfin at users.sourceforge.net]

Revision: 25019
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25019&view=rev
Author:   fingolfin
Date:     2007-01-05 17:51:04 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Semi-auto-detect the location of the .dsl/.xsl files (hard coded list of paths for now)

Modified Paths:
--------------
    docs/trunk/docbook/Makefile
    docs/trunk/docbook/Makefile.xsltproc

Modified: docs/trunk/docbook/Makefile
===================================================================
--- docs/trunk/docbook/Makefile	2007-01-06 00:01:49 UTC (rev 25018)
+++ docs/trunk/docbook/Makefile	2007-01-06 01:51:04 UTC (rev 25019)
@@ -1,12 +1,16 @@
 include Makefile.common
 
-# FIXME: The following path works fine on my (Fingolfin's) system,
-# because that is where the Fink openjade package puts it.
-# But of course it'll be in some other place on other systems. 
-# I dunno right now how to set it up portably right now :-/
-DCL = -l /sw/share/sgml/openjade-1.3.2/pubtext/xml.dcl
-#DCL = -l /usr/share/sgml/declaration/xml.dcl
-#DCL = --cat docbook-xml-4.2/docbook.cat -l /usr/share/sgml/xml.dcl
+#
+# Try various potential locations for the DCL file, picking the
+# first one we find.
+#
+DCL_CANDIDATES = \
+  $(strip $(foreach TMP_DCL, \
+    /usr/share/sgml/xml.dcl \
+    /usr/share/sgml/declaration/xml.dcl \
+    /sw/share/sgml/openjade-1.3.2/pubtext/xml.dcl, \
+    $(shell test -f $(TMP_DCL) && echo $(TMP_DCL))))
+DCL := --cat docbook-xml-4.2/docbook.cat -l $(firstword $(DCL_CANDIDATES))
 
 
 #

Modified: docs/trunk/docbook/Makefile.xsltproc
===================================================================
--- docs/trunk/docbook/Makefile.xsltproc	2007-01-06 00:01:49 UTC (rev 25018)
+++ docs/trunk/docbook/Makefile.xsltproc	2007-01-06 01:51:04 UTC (rev 25019)
@@ -1,15 +1,20 @@
 include Makefile.common
 
-# Settings for the modern XSL/FOP based toolchain.
-# FIXME: This path is tuned for Fink / OS X
-DOCBOOK_XSL = /sw/share/xml/xsl/docbook-xsl
-#DOCBOOK_XSL = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh
-#DOCBOOK_XSL = docbook-xsl-1.71.1
+#
+# Try various potential locations for the stylesheets, picking the
+# first one we find.
+#
+XSL_CANDIDATES = \
+  $(strip $(foreach TMP_XSL, \
+    /sw/share/xml/xsl/docbook-xsl \
+    /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
+    ./docbook-xsl, \
+    $(shell test -d $(TMP_XSL) && echo $(TMP_XSL))))
+DOCBOOK_XSL := $(firstword $(XSL_CANDIDATES))
 
 
-
 #
-# This second set of rules uses docbook-xsl and xsltproc (from libxslt)
+# These rules use docbook-xsl and xsltproc (from libxslt)
 # as well as fop to create HTML, XHTML and PDF output.
 #
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.