lilypond-1.2.7

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ac24fa99c914d2d0dcd52422bb1f29e48c075355..e8d8df44ffc68bfd1fbe0e5492638dfd85e6cf94 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -5,6 +5,7 @@ depth = ..
 NAME = documentation
 SUBDIRS= tex metadoc bibliography pictures topdocs ntweb
 STEPMAKE_TEMPLATES=documentation  texinfo
+
 README_TOP_FILES=NEWS DEDICATION TODO  AIMS
 INFO_FILES = $(wildcard $(outdir)/$(package).info*)
 EXTRA_DIST_FILES = COPYRIGHT 
@@ -19,3 +20,7 @@ default: do-doc
 
 info: $(outdir)/$(package).info
 
+local-WWW: copy-for-me
+
+copy-for-me:
+       $(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true

diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index 2f32642a650768fbb1ad548ba1fd19e22d7bc150..534db01acbd8903c218ecab9a03f0cf0c5c04c3e 100644 (file)
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -15,7 +15,6 @@ $(outdir)/%.png: %.xpm
 $(outdir)/%.txt: $(outdir)/%.1
        troff -man -Tascii $< | grotty -b -u -o > $@
 
-
 include $(stepdir)/yodl-rules.make
 include $(stepdir)/texinfo-rules.make
 

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index d5f7c50f3139a7da4c1ccce228bde7b93d738f4e..d02041f4d2d0116500eb134444f075f68ec1f0aa 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -3,32 +3,19 @@ default:
 
 do-doc: $(OUTTXT_FILES) 
 
-# ugh. FIXME
-ifeq ($(strip $(README_TOP_FILES)),)
-readme-top_FILES-html:
-readme-top_FILES-txt:
-else
-
-readme-top_FILES-txt:
-       $(foreach i, $(README_TOP_FILES), \
-         cp $(depth)/$(i) $(outdir)/$(i).txt && ) true
-
-readme-top_FILES-html:
-       $(foreach i, $(README_TOP_FILES), \
-         $(SHELL) $(step-bindir)/text2html.sh $(outdir)/$(i).txt $(outdir)/$(i).html && \
-         $(PYTHON) $(step-bindir)/add-html-footer.py --package=$(topdir) --index=$(depth)/../index.html $(outdir)/$(i).html && ) true
-endif
 
-local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREADME_HTML_FILES) 
+local-WWW: $(OUTHTML_FILES)
        echo $^ > $(depth)/wwwlist
 
 doc: do-doc
 
+
+# what to do here?
+ifeq (a,b) 
+
 $(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES)
        $(MAKEINFO) --force -o $@ $(outdir)/topinfo.texinfo
 
-# what to do here?
-ifneq ($(strip $(INFO_FILES)),)
 
 INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_FILES)" -f $(stepdir)/install-out.sub.make $@
 

diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index 0cf6a9a022c07c41ebc6224543d5e129d72cceb6..a4e84683e11cdc931924a5f1bee0e10057291e65 100644 (file)
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -15,8 +15,8 @@ OUTTEXINFO_FILES = $(addprefix $(outdir)/,$(TEXINFO_FILES))
 #
 ALL_DOC_FILES = $(POD_FILES) $(TEXINFO_FILES) $(YO_FILES)
 OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
-OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) # $(OUTREADME_HTML_FILES)
-# OUTTEXINFO_FILES= $(addprefix $(outdir)/, $(addsuffix .texinfo,$(basename $(YO_FILES) .yo)))
+OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html)
+
 OUTREADME_TXT_FILES=$(addprefix $(outdir)/,$(addsuffix .txt, $(README_TOP_FILES)))
 OUTREADME_HTML_FILES=$(addprefix $(outdir)/,$(addsuffix .html, $(README_TOP_FILES)))