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 b60c80a6b8d068d9e33f4c029b49a39fb5572292..aa2e25899bc7b6f0ada20be72e51b3f3e2bac83c 100644 (file)
--- 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 50facc623364ab66f550e0fe1fd6d783c0c140f8..d685d818bcb88ce5f33cffde540e33f51fd60d11 100644 (file)
--- 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 b40a9b973d40883b544b3cf88abe9f1c32ebe8ed..c494977f8b4771d2d672c39cdbb7b76e546ba7da 100644 (file)
--- 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 5b0535792dc9cd3ec88ec0a1431091837f9ec594..a152644cd334a44db3e8aed20edc328e3c07f1d1 100644 (file)
--- 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: