3 @@ -12717,7 +12717,7 @@
7 - for ac_prog in texi2html
8 + for ac_prog in makeinfo
10 # Extract the first word of "$ac_prog", so it can be a program name with args.
11 set dummy $ac_prog; ac_word=$2
15 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
17 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
18 -STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
19 +STEPMAKE_PROGS(TEXI2HTML, makeinfo, $DOCUMENTATION_REQUIRED, 1.82)
20 STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
21 STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
22 STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED)
23 --- a/make/website.make
24 +++ b/make/website.make
26 top-htaccess=$(trusted-dir)/lilypond.org.htaccess
27 dir-htaccess=$(trusted-dir)/website-dir.htaccess
29 - TEXI2HTML_PROGRAM=texi2html
30 + TEXI2HTML_PROGRAM=makeinfo
32 PYTHONPATH=$(TRUSTED_DIR)
35 WEB_LANGS := $(shell MAKEWEB=1 $(PYTHON) $(top-src-dir)/python/langdefs.py)
37 TEXI2HTML=ONLY_WEB_VERSION=v$(MAJOR_VERSION).$(MINOR_VERSION) TOP_SRC_DIR=$(top-src-dir) DEPTH=$(depth) PERL_UNICODE=SD \
38 - $(TEXI2HTML_PROGRAM) -D web_version --prefix=index --split=section \
39 + $(TEXI2HTML_PROGRAM) --html -D web_version --split=section \
40 --init-file=$(texi2html-init-file) \
42 --I=$(top-src-dir)/Documentation \
43 --- a/scripts/auxiliar/cg-section.sh
44 +++ b/scripts/auxiliar/cg-section.sh
46 : "${LILYPOND_BUILD_DIR:=$LILYPOND_GIT/build}"
47 DOC_DIR="${LILYPOND_TEMPDOCS:-$LILYPOND_BUILD_DIR/tempdocs}"
48 LILYPOND_BOOK="$LILYPOND_BUILD_DIR/out/bin/lilypond-book"
49 -TEXI2HTML="texi2html"
50 +TEXI2HTML="makeinfo --html"
51 REFCHECK="$LILYPOND_GIT/scripts/auxiliar/ref_check.py"
55 echo "Running $TEXI2HTML"
56 cat "$DOC_DIR/macros.itexi" "$SECTION_PATH" > "$OUTPUT_DIR/$SECTION.texi"
61 --output="$OUTPUT_DIR/out/$SECTION.html" \
62 --I="$LILYPOND_GIT/Documentation" \
63 --- a/scripts/auxiliar/doc-section.sh
64 +++ b/scripts/auxiliar/doc-section.sh
66 : "${LILYPOND_BUILD_DIR:=$LILYPOND_GIT/build}"
67 DOC_DIR="${LILYPOND_TEMPDOCS:-$LILYPOND_BUILD_DIR/tempdocs}"
68 LILYPOND_BOOK="$LILYPOND_BUILD_DIR/out/bin/lilypond-book"
69 -TEXI2HTML="texi2html"
70 +TEXI2HTML="makeinfo --html"
71 REFCHECK="$LILYPOND_GIT/scripts/auxiliar/ref_check.py"
75 if test -f "$OUTPUT_DIR/out/$SECTION.texi"; then
76 echo "Running $TEXI2HTML"
77 cat "$DOC_DIR/macros.itexi" "$OUTPUT_DIR/out/$SECTION.texi" > "$OUTPUT_DIR/$SECTION.texi"
81 --output="$OUTPUT_DIR/out/$SECTION.html" \
82 --I="$OUTPUT_DIR/out" \
83 --- a/stepmake/stepmake/texinfo-vars.make
84 +++ b/stepmake/stepmake/texinfo-vars.make
87 TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
89 -TEXI2HTML_SPLIT = --prefix=index --split=section
90 +TEXI2HTML_SPLIT = --split=section
92 TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
93 -TEXI2HTML_FLAGS += --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
94 +TEXI2HTML_FLAGS += -html --error-limit=0 $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
95 TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)