* make/ly-rules.make:

* stepmake/aclocal.m4:
* Documentation/user/GNUmakefile: Remove old makeinfo compatibility.

diff --git a/ChangeLog b/ChangeLog
index 41d04bf40dbf71bc00ad63abb936107a2a2f5f4e..cb5d19a0e6dcdaf8d78b339d92f823fc1a9b6f2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * make/ly-rules.make: 
+       * stepmake/aclocal.m4: 
+       * Documentation/user/GNUmakefile: Remove old makeinfo compatibility.
+
        * buildscripts/fixcc.py (rules): Leave space after operator.
 
 2005-03-14  Werner Lemberg  <wl@gnu.org>

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 442cc0bea301d3405e14cf8ce8c1ec8582971a76..3d6452e5b5f8e8b54be2f2dadc51a191bf7a9431 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -173,8 +173,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
@@ -187,20 +185,6 @@ DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html
 
-else
-
-# Links referred to by Documentation index
-LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
-
-local-WWW: 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) $(DEEP_HTML_FILES)\
  $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) info info-dir
 

diff --git a/configure.in b/configure.in
index c496d7415d9baacd6d7c51696510537dfef8f35c..94b6c22203a529e7f70ec991d21dbc1c19c6a92d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -93,7 +93,6 @@ STEPMAKE_PERL(OPTIONAL)
 # without the docs, they can find this comment and use an older
 # makeinfo -- but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
-AC_SUBST(MAKEINFO_VERSION)
 
 
 if test "$optimise_b" = yes; then

diff --git a/make/ly-rules.make b/make/ly-rules.make
index a49eed57e12f1fcd675dacda9889072b17fd60d3..6198c7879909674e97c44a98b274479c3eca87cb 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 344d4c247922236eb5861dc05be0caefcfd061ed..0bc586ba1baf9399568eab5d00e2632747e3c804 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -893,31 +893,9 @@ AC_DEFUN(STEPMAKE_LOCALE, [
 
 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)