* make/ly-rules.make ($(outdir)/%.nexi): Remove old makeinfo

compatibility.

* Documentation/user/GNUmakefile: Remove splitting-makeinfo.

diff --git a/ChangeLog b/ChangeLog
index e878b05924f28d9db9070f098e6845fbb2f6a272..c74844bb63e0371188a2a8e965d7303687a00cf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * make/ly-rules.make ($(outdir)/%.nexi): Remove old makeinfo
+       compatibility.
+
+       * Documentation/user/GNUmakefile: Remove splitting-makeinfo.
+
 2005-03-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/regression/page-breaks.ly: Fix and update.

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 073924a74ba3326ad0cf85f9c0f1b600c576be16..d62ef590126490cc97107d12676dbd6dc7f7ce4c 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -117,8 +117,6 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal
        mkdir -p $(dir $@)
        $(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $<
 
-ifeq ($(SPLITTING_MAKEINFO),yes)
-
 $(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/%.png: %.png
@@ -129,21 +127,6 @@ $(outdir)/%.eps: %.png
 
 DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
 
-else
-
-# Links referred to by Documentation index
-LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
-
-local-WWW: outimages deep-symlinks
-
-deep-symlinks:
-       mkdir -p $(outdir)/lilypond
-       cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
-               rm -f $(i) && ln -s lilypond.html $(i) &&) true
-
-endif
-
-
 local-WWW: $(HTML_FILES) $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info info-dir
 
 local-WWW-clean: deep-WWW-clean

diff --git a/config.make.in b/config.make.in
index c550138b1829a78e5fa92ed980628730aca5f70a..2ee6b9553e222e32809913058e3fd5905b9389c4 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -70,8 +70,6 @@ GXX = @GXX@
 LD = @LD@
 CONFIGSUFFIX = @CONFIGSUFFIX@
 MAKEINFO_PROGRAM = @MAKEINFO@
-SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
-MAKEINFO_VERSION = @MAKEINFO_VERSION@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 TFM_PATH = @TFM_PATH@

diff --git a/configure.in b/configure.in
index 1aade6059730329a8a3c0ef5faca22d3d5ea309f..4bfa1c9cbc7500def23baf77a674a930e8b8f0ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -97,8 +97,6 @@ STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.1.1)
 
 # new makeinfo for multi-page website docs
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
-AC_SUBST(MAKEINFO_VERSION)
-
 
 if test "$optimise_b" = yes; then
     DEFINES="$DEFINES -DSTRING_UTILS_INLINED"

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 0ab32491c1c750d57bec34a96e66a404cdfcde98..6901ddef580c328729cd5753893564034bcbb6ef 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -23,11 +23,6 @@ $(outdir)/%.nexi: %.tely
        rm -f $(outdir)/$*.texi
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) --process='true' $<
        mv $(outdir)/$*.texinfo $@ 2>/dev/null || mv $(outdir)/$*.texi $@
-# makeinfo <= 4.6 image bug workaround
-       if [ $(MAKEINFO_VERSION) -le 4006000 ]; then \
-               (cd $(outdir) && \
-               ls -1 lily-*.ly | sed 's/.ly$$/.txt/' | xargs touch) || true; \
-       fi
 
 $(outdir)/%.info: $(outdir)/%.nexi
        $(MAKEINFO) -I $(outdir) --output=$(outdir)/$(*F).info $<

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 75650eb31ff1f7df812d14bafc0efcd649325567..7057ffd0f53a9b7ab8350a39657bae64dbff2160 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -840,37 +840,14 @@ AC_DEFUN(STEPMAKE_LOCALE, [
     if test "$lang" = "unknown" ; then
        STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS)
     fi
-
 ])
 
 
 AC_DEFUN(STEPMAKE_MAKEINFO, [
     STEPMAKE_PROGS(MAKEINFO, makeinfo, $1)
-    if test "$MAKEINFO" = "makeinfo"; then
-       AC_MSG_CHECKING(whether makeinfo can split html by @node)
-       mkdir -p out
-       makeinfo --html --output=out/split <<EOF
-\input texinfo
-\input texinfo @c -*-texinfo-*-
-@setfilename split.info
-@settitle split.info
-@bye
-EOF
-       if test -d out/split; then
-           SPLITTING_MAKEINFO=yes
-           AC_MSG_RESULT(yes)
-           rm -rf out/split
-       else
-           AC_MSG_RESULT(no)
-           STEPMAKE_WARN(your html documentation will be one large file)
-           rm -rf out/split
-       fi
-    fi
-    AC_SUBST(SPLITTING_MAKEINFO)
 ])
 
 
-
 AC_DEFUN(STEPMAKE_MAN, [
     STEPMAKE_PROGS(GROFF, groff ditroff, $1)
     AC_SUBST(GROFF)