X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Ftopdocs%2FGNUmakefile;h=43a99497c10c8c78af1b8432170123142eae2c4e;hb=db449e3935bc8b765979e1d4a4ab3018908cbbd8;hp=537f761b0a8f847f578e16c0a8f99f12d664dad1;hpb=7e57eb7daf165db3cc1ed70c8173f8692818f83b;p=lilypond.git

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 537f761b0a..43a99497c1 100644
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -1,20 +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
-TEXI2HTML_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