From: Chas Williams (CONTRACTOR) <chas@cmf.nrl.navy.mil>
Date: Sun, 23 Sep 2012 23:02:19 +0000 (-0400)
Subject: doc: fix kindle builds of documentation
X-Git-Tag: upstream/1.8.0_pre1^2~1979
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fe72b581d7c0a5285f109109ae7ed703f1d62b6f;p=packages%2Fo%2Fopenafs.git

doc: fix kindle builds of documentation

Use kindlegen located by the configure stage and test for
kindlegen and dbtoepub before building in all cases.

Change-Id: Ieb46023ddf0725a2c93f96e29f942b71343d53dd
Reviewed-on: http://gerrit.openafs.org/8148
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Ken Dreyer <ktdreyer@ktdreyer.com>
---

diff --git a/doc/xml/AdminGuide/Makefile.in b/doc/xml/AdminGuide/Makefile.in
index b60c80a6b..aa2e25899 100644
--- a/doc/xml/AdminGuide/Makefile.in
+++ b/doc/xml/AdminGuide/Makefile.in
@@ -30,6 +30,7 @@ HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
+KINDLEGEN = @KINDLEGEN@
 DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
 
 index.html: $(SRCS)
@@ -51,7 +52,7 @@ $(BOOK).epub: $(SRCS)
 
 $(BOOK).mobi: $(BOOK).epub
 	if test -n "$(KINDLEGEN)" && test -x "$(DBTOEPUB)" ; then \
-		kindlegen $(BOOK).epub -o $(BOOK).mobi; \
+		$(KINDLEGEN) $(BOOK).epub -o $(BOOK).mobi; \
 	fi
 
 check:
diff --git a/doc/xml/AdminRef/Makefile.in b/doc/xml/AdminRef/Makefile.in
index 50facc623..d685d818b 100644
--- a/doc/xml/AdminRef/Makefile.in
+++ b/doc/xml/AdminRef/Makefile.in
@@ -14,6 +14,7 @@ DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@ --stringparam variablelist.as.blocks 1
 DOCBOOK2PDF = @DOCBOOK2PDF@
 DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
+KINDLEGEN = @KINDLEGEN@
 
 entities.dtd sect1.xml sect5.xml sect8.xml:
 	./generate-xml.pl $(TOP_SRCDIR)
@@ -32,7 +33,9 @@ $(BOOK).epub: $(SRCS)
 	fi
 
 $(BOOK).mobi: $(BOOK).epub
-	kindlegen $(BOOK).epub -o $(BOOK).mobi
+	if test -n "$(KINDLEGEN)" && test -x "$(DBTOEPUB)" ; then \
+		$(KINDLEGEN) $(BOOK).epub -o $(BOOK).mobi; \
+	fi
 
 check:
 	xmllint --noout --valid $(BOOK).xml
diff --git a/doc/xml/QuickStartUnix/Makefile.in b/doc/xml/QuickStartUnix/Makefile.in
index b40a9b973..c494977f8 100644
--- a/doc/xml/QuickStartUnix/Makefile.in
+++ b/doc/xml/QuickStartUnix/Makefile.in
@@ -29,6 +29,7 @@ DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
+KINDLEGEN = @KINDLEGEN@
 
 index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
@@ -49,7 +50,7 @@ $(BOOK).epub: $(SRCS)
 
 $(BOOK).mobi: $(BOOK).epub
 	if test -n "$(KINDLEGEN)" && test -x "$(DBTOEPUB)" ; then \
-		kindlegen $(BOOK).epub -o $(BOOK).mobi; \
+		$(KINDLEGEN) $(BOOK).epub -o $(BOOK).mobi; \
 	fi
 
 check:
diff --git a/doc/xml/UserGuide/Makefile.in b/doc/xml/UserGuide/Makefile.in
index 5b0535792..a152644cd 100644
--- a/doc/xml/UserGuide/Makefile.in
+++ b/doc/xml/UserGuide/Makefile.in
@@ -29,6 +29,7 @@ DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
 DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
+KINDLEGEN = @KINDLEGEN@
 
 index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
@@ -49,7 +50,7 @@ $(BOOK).epub: $(SRCS)
 
 $(BOOK).mobi: $(BOOK).epub
 	if test -n "$(KINDLEGEN)" && test -x "$(DBTOEPUB)" ; then \
-		kindlegen $(BOOK).epub -o $(BOOK).mobi; \
+		$(KINDLEGEN) $(BOOK).epub -o $(BOOK).mobi; \
 	fi
 
 check: