From eb25c5b1c3b7d7e25ce00bafc08fa2d92acc4afa Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 6 Apr 2010 15:07:47 -0400 Subject: [PATCH] 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 Tested-by: Jeffrey Altman --- doc/xml/AdminGuide/NTMakefile | 6 ++++++ doc/xml/QuickStartUnix/NTMakefile | 6 ++++++ doc/xml/ReleaseNotesWindows/NTMakefile | 6 ++++++ doc/xml/UserGuide/NTMakefile | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/doc/xml/AdminGuide/NTMakefile b/doc/xml/AdminGuide/NTMakefile index faf0627..f899734 100644 --- 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 887d56d..953b2de 100644 --- 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 1421930..81e81e9 100644 --- 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 8481d58..0ba8bfd 100644 --- 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 -- 1.9.4