Don't fail to build documentation if kindlegen doesn't exist

Check for kindlegen in configure and do nothing in the MOBI build
rule if the binary didn't exist.

This is still a bit of a hack since the rule will run with every
invocation of make.  The target needs to be made conditional.  But
at least this way make all in the documentation directory doesn't
fail.

Change-Id: I57f158929b3907678b9848a60edb9765136f7dbb
Reviewed-on: http://gerrit.openafs.org/5090
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>

diff --git a/acinclude.m4 b/acinclude.m4
index eea7df8..05ab22f 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -259,6 +259,10 @@ AC_ARG_WITH([docbook-stylesheets],
 
 enable_login="no"
 
+dnl Check whether kindlegen exists.  If not, we'll suppress that part of the
+dnl documentation build.
+AC_CHECK_PROGS([KINDLEGEN], [kindlegen])
+
 dnl weird ass systems
 dnl AC_AIX
 AC_ISC_POSIX

diff --git a/doc/xml/AdminGuide/Makefile.in b/doc/xml/AdminGuide/Makefile.in
index 8bcc332..b60c80a 100644 (file)
--- a/doc/xml/AdminGuide/Makefile.in
+++ b/doc/xml/AdminGuide/Makefile.in
@@ -50,7 +50,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 594bc6c..b40a9b9 100644 (file)
--- a/doc/xml/QuickStartUnix/Makefile.in
+++ b/doc/xml/QuickStartUnix/Makefile.in
@@ -48,7 +48,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/UserGuide/Makefile.in b/doc/xml/UserGuide/Makefile.in
index 42e4053..aeb28ab 100644 (file)
--- a/doc/xml/UserGuide/Makefile.in
+++ b/doc/xml/UserGuide/Makefile.in
@@ -47,7 +47,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