lilypond-1.3.123

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 5c6310c150cd93e3a16bd3739a74a1f5611de5e9..2259ace7e6668bf71fbb2698d886b12041ce07fe 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -61,25 +61,31 @@ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-interna
        -cp -f $(outdir)/lilypond-internals/index.html $@
        $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
-$(outdir)/features/features.html: $(outdir)/features.texi
-       -$(MAKEINFO) --force --output=$@ --html $<
-       -cp -f $(outdir)/*.png $(outdir)/features
-       -cp -f $(outdir)/features/index.html $@
-       $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
-
 ifneq ($(SPLITTING_MAKEINFO),)
 
-DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html $(outdir)/features/features.html
+DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
 
 else
 
 DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
 
+local-WWW: deep-symlinks
+
+
+
+# Links referred to by Documentation index
+LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html
+
+deep-symlinks:
+       cd $(outdir) && rm -f lilypond && ln -s . lilypond
+       cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals
+       cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\
+               rm -f $(i) && ln -s $(i) lilypond.html &&) true
 endif
 
 
 local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
-       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals features
+       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
        $(MAKE) footify
        $(MAKE) deep-footify
 
@@ -96,7 +102,7 @@ $(outdir)/%.bib: %.bib
 
 localclean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
-       rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/features
+       rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
 backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
        $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals

diff --git a/VERSION b/VERSION
index 3391de22605220a0bd77aa031f34ad4f11df0b93..6509481f50e5f57b83fe04c0a03a4f5619eaf91a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=122
+PATCH_LEVEL=123
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a