[Lsb-messages] /var/www/bzr/lsb/devel/fhs-spec r67: That path wasn't right either; use a set of paths and search between them.

[Jeff Licquia]

------------------------------------------------------------
revno: 67
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: fhs-spec
timestamp: Mon 2015-04-20 15:11:42 -0400
message:
  That path wasn't right either; use a set of paths and search between them.
modified:
  Makefile
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2015-04-20 18:13:32 +0000
+++ b/Makefile	2015-04-20 19:11:42 +0000
@@ -3,8 +3,11 @@
 XMLTOARGS_NEW=--stringparam  section.autolabel=1 --stringparam  section.label.includes.component.label=1 --stringparam  chunker.output.encoding=UTF-8
 XSLTPROCARGS=--stringparam  section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam  chunker.output.encoding UTF-8
 
-# Location of DocBook upstream docbook.xsl for html-nochunks on the system.
-HTML_NOCHUNK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl
+# Possible locations of DocBook upstream docbook.xsl for html-nochunks
+# on the system.
+HTML_NOCHUNK_XSL_LOCATIONS=/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \
+                           /usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl \
+                           /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl
 
 ifeq ($(shell xmlto --help | grep stringparam | wc -l),0)
 XMLTOARGS=$(XMLTOARGS_OLD)
@@ -15,7 +18,12 @@
 all: fhs.html fhs/index.html fhs.txt fhs.pdf
 
 docbook-utf8.xsl: docbook-utf8.xsl.in
-	sed s, at HTML_NOCHUNK_XSL@,$(HTML_NOCHUNK_XSL),g < $< > $@
+	for f in $(HTML_NOCHUNK_XSL_LOCATIONS); do \
+	  if [ -e $$f ]; then \
+	    sed s, at HTML_NOCHUNK_XSL@,$$f,g < $< > $@; \
+	    break; \
+	  fi; \
+	done
 
 fhs.ps: $(XMLFILES)
 	xmlto $(XMLTOARGS) ps fhs.xml