Remove support for HTML output by makeinfo

(cherry picked from commit 3b4077d10004e5bcf50c1ffd87d1bc1be7f65061)

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 1f26adb757a3a6e42d861b1e281698f9e2740e0a..525e865279073545314579afc24c91807742b158 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -214,10 +214,7 @@ about which font packages are necessary for your platform)
 @uref{http://bugs.ghostscript.com/show_bug.cgi?id=688154}
 and the patch from
 @uref{http://bugs.ghostscript.com/show_bug.cgi?id=688017}.
-@item @uref{http://www.nongnu.org/texi2html/,Texi2HTML} 1.79 or newer
-is strongly recommended to build documentation in HTML; support for
-building HTML documentation using @command{makeinfo} from GNU Texinfo
-is deprecated.
+@item @uref{http://www.nongnu.org/texi2html/,Texi2HTML} 1.80 or newer
 @item rsync
 @end itemize
 

diff --git a/configure.in b/configure.in
index 306f05a5f2717fb02a099cbb1ccf8d390dd6f2b8..a5af1fc4f587f6de837741554f57c73a430420f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ STEPMAKE_GUILE(OPTIONAL)
 STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.79)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.80)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 

diff --git a/make/doc-i18n-topdocs-rules.make b/make/doc-i18n-topdocs-rules.make
index 55997b4a8d5cdf8abf0e98077bb98abe826857ea..874e7d5537963e3428a021ffa9ffec4d2473ab20 100644 (file)
--- a/make/doc-i18n-topdocs-rules.make
+++ b/make/doc-i18n-topdocs-rules.make
@@ -1,11 +1,6 @@
-ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL)))
 $(outdir)/%.html: $(outdir)/%.texi
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
        cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
-else # Rules using makeinfo follow
-$(outdir)/%.html: $(outdir)/%.texi
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
-endif
 
 $(outdir)/%.pdf: $(outdir)/%.texi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).texi

diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make
index 59bfe8b6f139c1e2688e644c5766879b8632f8c6..4b59115ecd60deb25b254b56152a2f0698c3e9ec 100644 (file)
--- a/make/doc-i18n-user-rules.make
+++ b/make/doc-i18n-user-rules.make
@@ -1,4 +1,3 @@
-ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL)))
 $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES)
        mkdir -p $(dir $@)
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
@@ -7,14 +6,6 @@ $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES)
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
        cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
-else # Rules using makeinfo follow
-$(outdir)/%/index.html: $(outdir)/%.texi
-       mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
-
-$(outdir)/%-big-page.html: $(outdir)/%.texi
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
-endif
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi
        $(buildscript-dir)/texi-gettext $(ISOLANG) $<

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 10ceb5c71024e81cd8cca79e8f0f5cf7434c4c25..3f605b2a28388f1694f349205bbbf044c3e9d816 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -26,7 +26,6 @@ endif
 $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
        $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
 
-ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL)))
 $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $<
        cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
@@ -40,17 +39,6 @@ $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/v
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
        cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-else # Rules using makeinfo follow
-$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi
-       $(MAKEINFO) -I$(src-dir) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
-
-$(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.itexi
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
-
-$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
-       mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
-endif
 
 $(outdir)/%.html.omf: %.texi
        $(call GENERATE_OMF,html)