From: fred <fred>
Date: Wed, 27 Mar 2002 00:58:46 +0000 (+0000)
Subject: lilypond-1.3.142
X-Git-Tag: release/1.5.59~833
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e551bfedd8e76f7bbfdac5005c4912039c3d21a4;p=lilypond.git

lilypond-1.3.142
---

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 80ab9a654a..10f82f091d 100644
--- 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 646742c443..ec01807e4b 100644
--- 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 875833e447..a1d371d022 100644
--- 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 0ce1bbc946..c27f2f19d3 100644
--- 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
index 0000000000..7a548bc2cf
--- /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
index 0000000000..f820c182a4
--- /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
index 0000000000..336c26b984
--- /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 6486853b6c..6ab5a4ed16 100644
--- 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