bitkeeper revision 1.1159.270.1 (423308766_Mxiqyj1XF-m4OxnLnExA)

No longer require latex2html (bizarrely considered 'non-free' by Debian
maintainers) to build docs. Instead we still build PS/PDF docs, but skip
HTML docs.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

diff --git a/docs/Makefile b/docs/Makefile
index e05a84fad4e763a22a456daa6975e1bbb2c8980e..8b968dc87e674d932ba83e39bf2566f8e69de096 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,9 @@ ps: $(DOC_PS)
 
 pdf: $(DOC_PDF)
 
-html: $(DOC_HTML)
+html:
+       @if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \
+       $(MAKE) $(DOC_HTML); fi
 
 clean:
        rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
@@ -37,7 +39,7 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
        cp -dR ps $(DESTDIR)$(pkgdocdir)
        cp -dR pdf $(DESTDIR)$(pkgdocdir)
-       cp -dR html $(DESTDIR)$(pkgdocdir)
+       [ ! -d html ] || cp -dR html $(DESTDIR)$(pkgdocdir)
 
 pdf/%.pdf: ps/%.ps
        $(INSTALL_DIR) $(@D)

diff --git a/docs/check_pkgs b/docs/check_pkgs
index e70572045889540ce0d19804c36c1629cad91756..25a624ef24016f8919f9597aee7a5ed668347154 100644 (file)
--- a/docs/check_pkgs
+++ b/docs/check_pkgs
@@ -13,7 +13,6 @@ silent_which ()
 }
 
 silent_which latex      || exit 1
-silent_which latex2html || exit 1
 silent_which dvips      || exit 1
 silent_which ps2pdf     || exit 1
 silent_which fig2dev    || exit 1