lilypond-1.3.142

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 80ab9a654afbbad1f5bec54934742d62f31ddd2a..10f82f091d856b195afdb2e99edeac1bbf7fdf92 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -1,22 +1,8 @@
 depth = ../..
 
 
-STEPMAKE_TEMPLATES=documentation tex texinfo
+STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html))
 
-#default: local-doc 
-
 include $(depth)/make/stepmake.make 
-
-copy-to-top:  $(TO_TOP_FILES)
-       $(foreach i, $(TO_TOP_FILES), \
-         cp $(i) $(depth)/ && ) true
-       -cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
-
-###local-WWW: copy-to-top
-
-local-WWW: $(HTML_FILES) copy-to-top
-# we want footers even if website builds (or is built) partly
-       $(MAKE) footify
-

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 646742c4433764d051b83915b1baba3d7fc9d469..ec01807e4b6c9285b193f4a587ef9211ec58e9c5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -72,7 +72,7 @@ lily: lily/$(outdir)/lilypond
 lily/$(outdir)/lilypond:
        $(MAKE) -C lily
 
-local-web: fonts lily $(TOP_HTMLS:%.html=%) footify top-web
+local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web
 
 top-web:
        rm -f `find . -name \*.html~ -print`

diff --git a/buildscripts/GNUmakefile b/buildscripts/GNUmakefile
index 875833e44791cc0c511c348397aad28f98386f5a..a1d371d0223fab3aaebcd5321a87ccc8a70b998d 100644 (file)
--- a/buildscripts/GNUmakefile
+++ b/buildscripts/GNUmakefile
@@ -1,7 +1,7 @@
 # bin/Makefile
 
 depth = ..
-STEPMAKE_TEMPLATES=script install
+STEPMAKE_TEMPLATES=script install po
 
 include $(depth)/make/stepmake.make 
 
@@ -14,3 +14,4 @@ all: $(outdir)/gettext.py
 
 
 
+

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 0ce1bbc946bc68cdbafc2d5890db395d5b346341..c27f2f19d33ab43010e1f0554fabb094c1a02b2d 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1,10 +1,10 @@
 #!@PYTHON@
-
-# convert-lilypond.py -- convertor for lilypond versions
+#
+# convert-ly.py -- convertor for lilypond versions
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1998 
+# (c) 1998--2001
 
 # TODO
 #   use -f and -t for -s output

diff --git a/stepmake/stepmake/topdocs-rules.make b/stepmake/stepmake/topdocs-rules.make
new file mode 100644 (file)
index 0000000..7a548bc
--- /dev/null
+++ b/stepmake/stepmake/topdocs-rules.make
@@ -0,0 +1 @@
+#epmty
\ No newline at end of file

diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
new file mode 100644 (file)
index 0000000..f820c18
--- /dev/null
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -0,0 +1,14 @@
+
+default: local-doc 
+
+copy-to-top:  $(TO_TOP_FILES)
+       $(foreach i, $(TO_TOP_FILES), \
+         cp $(i) $(depth)/ && ) true
+       -cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
+
+###local-WWW: copy-to-top
+
+local-WWW: $(HTML_FILES) copy-to-top
+# we want footers even if website builds (or is built) partly
+       $(MAKE) footify
+

diff --git a/stepmake/stepmake/topdocs-vars.make b/stepmake/stepmake/topdocs-vars.make
new file mode 100644 (file)
index 0000000..336c26b
--- /dev/null
+++ b/stepmake/stepmake/topdocs-vars.make
@@ -0,0 +1,2 @@
+TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
+

diff --git a/stepmake/stepmake/toplevel-vars.make b/stepmake/stepmake/toplevel-vars.make
index 6486853b6c08d911c4a2818994058a9f69f5a574..6ab5a4ed163c7e658caad173a2e26523cca2c4b3 100644 (file)
--- a/stepmake/stepmake/toplevel-vars.make
+++ b/stepmake/stepmake/toplevel-vars.make
@@ -2,8 +2,6 @@
 # override Generic_vars.make:
 DIST_FILES := $(EXTRA_DIST_FILES) 
 
-TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES))
-
 # urg?
 include $(stepdir)/documentation-vars.make