X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=Documentation%2Ftopdocs%2FGNUmakefile;h=43a99497c10c8c78af1b8432170123142eae2c4e;hb=3b322e2bf09b761f165c09a7f5ee83e282dcd1d2;hp=6fd3a7504fab40667f37e8eafc76f27e28c32752;hpb=edf17353d89f4f6bd831466262402bb9151a26ca;p=lilypond.git

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 6fd3a7504f..43a99497c1 100644
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -1,19 +1,21 @@
 depth = ../..
 
-
 STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)
+OUT_TEXI_FILES = $(TEXI_FILES:%.texi=$(outdir)/%.texi) $(TELY_FILES:%.tely=$(outdir)/%.texi)
 HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%.html)
-PDF_FILES=$(outdir)/NEWS.pdf
 README_TOP_FILES=NEWS AUTHORS INSTALL README
 OUTTXT_FILES= $(outdir)/NEWS.txt
 
 include $(depth)/make/stepmake.make
 
-MAKEINFO_FLAGS += -I $(top-src-dir)/Documentation/user
-
-local-WWW-1: $(OUT_TEXI_FILES)
+DOCUMENTATION_INCLUDES += -I $(outdir) \
+  -I $(top-src-dir)/Documentation
 
-.SECONDARY:
+# FIXME ad-hoc file copy?
+$(outdir)/NEWS.tely: $(top-src-dir)/Documentation/changes.tely
+	cp -f $< $@
 
+ifeq ($(out),www)
+local-WWW-1: $(OUT_TEXI_FILES)
+endif