Windows: Support new Cygwin docbook stylesheet location

Make the computation of the docbook stylesheet location
based upon testing for directory existence now that versions
of cygwin 1.7.2 and place the stylesheets in a new location.

Change-Id: I844ae35a34eab73ee033bba875e68f71dc54f26b
Reviewed-on: http://gerrit.openafs.org/1702
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/doc/xml/AdminGuide/NTMakefile b/doc/xml/AdminGuide/NTMakefile
index faf0627fd4e113fca35bbbeffe228b069e70a110..f899734c2c4e9ecda989d9ab644472cc49316887 100644 (file)
--- a/doc/xml/AdminGuide/NTMakefile
+++ b/doc/xml/AdminGuide/NTMakefile
@@ -33,7 +33,13 @@ VERSFILE = version
 CYGWIN     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
+!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
 DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!ELSE
+!ERROR DOCBOOK_XSL cannot be determined
+!ENDIF
 !ENDIF
 XSLTPROC   = xsltproc.exe
 HTML_XSL = $(DOCBOOK_XSL)/html/chunk.xsl

diff --git a/doc/xml/QuickStartUnix/NTMakefile b/doc/xml/QuickStartUnix/NTMakefile
index 887d56d49354e7d605ebe2e2dedb6d527e8cf7bb..953b2de8f7e32283b5608bfaed05da53b21418ee 100644 (file)
--- a/doc/xml/QuickStartUnix/NTMakefile
+++ b/doc/xml/QuickStartUnix/NTMakefile
@@ -33,7 +33,13 @@ VERSFILE = version
 CYGWIN     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
+!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
 DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!ELSE
+!ERROR DOCBOOK_XSL cannot be determined
+!ENDIF
 !ENDIF
 XSLTPROC   = xsltproc.exe
 HTML_XSL = $(DOCBOOK_XSL)/html/chunk.xsl

diff --git a/doc/xml/ReleaseNotesWindows/NTMakefile b/doc/xml/ReleaseNotesWindows/NTMakefile
index 1421930a0d97596b25903814fa431f6ed6d4d213..81e81e96fd6b909a678d311ce52a3b92fb5cc6db 100644 (file)
--- a/doc/xml/ReleaseNotesWindows/NTMakefile
+++ b/doc/xml/ReleaseNotesWindows/NTMakefile
@@ -33,7 +33,13 @@ VERSFILE = version
 CYGWIN     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
+!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
 DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!ELSE
+!ERROR DOCBOOK_XSL cannot be determined
+!ENDIF
 !ENDIF
 XSLTPROC   = xsltproc.exe
 HTML_XSL = $(DOCBOOK_XSL)/html/chunk.xsl

diff --git a/doc/xml/UserGuide/NTMakefile b/doc/xml/UserGuide/NTMakefile
index 8481d583db5848c6856afd2ab3f0837a86a7a041..0ba8bfd5e2a13e7e01619c2511fcad67f6a9a27f 100644 (file)
--- a/doc/xml/UserGuide/NTMakefile
+++ b/doc/xml/UserGuide/NTMakefile
@@ -33,7 +33,13 @@ VERSFILE = version
 CYGWIN     = c:/cygwin
 !ENDIF
 !IFNDEF DOCBOOK_XSL
+!IF (EXIST($(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets))
+DOCBOOK_XSL = $(CYGWIN)/usr/share/sgml/docbook/xsl-stylesheets
+!ELSE IF (EXIST($(CYGWIN)/usr/share/docbook-xsl))
 DOCBOOK_XSL = $(CYGWIN)/usr/share/docbook-xsl
+!ELSE
+!ERROR DOCBOOK_XSL cannot be determined
+!ENDIF
 !ENDIF
 XSLTPROC   = xsltproc.exe
 HTML_XSL = $(DOCBOOK_XSL)/html/chunk.xsl