Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into kainhofer

[lilypond.git] / Documentation / topdocs / GNUmakefile

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 747f3993eee2a3ba238b748d5a71832acefc63eb..7e2d2641d936b38afdf1f685d541f6588d7f532c 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -5,10 +5,12 @@ STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%.html)
 PDF_FILES=$(outdir)/NEWS.pdf
-include $(depth)/make/stepmake.make 
+README_TOP_FILES=NEWS AUTHORS INSTALL README
+OUTTXT_FILES= $(outdir)/NEWS.txt
 
-ifneq ($(out),www)
-LILYPOND='true'
-endif
+include $(depth)/make/stepmake.make
+
+MAKEINFO_FLAGS += -I $(top-src-dir)/Documentation/user
+
+.SECONDARY:
 
-$(outdir)/NEWS.nexi: NEWS.tely