From: kaf24@viper.(none) <kaf24@viper.(none)>
Date: Sat, 12 Mar 2005 15:19:18 +0000 (+0000)
Subject: bitkeeper revision 1.1159.270.1 (423308766_Mxiqyj1XF-m4OxnLnExA)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17400^2~121^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7adbe03e19449bf5f9adbd341f08b091e1b6f717;p=xen.git

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 e05a84fad4..8b968dc87e 100644
--- 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 e705720458..25a624ef24 100644
--- 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