Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

[lilypond.git] / Documentation / topdocs / GNUmakefile

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index f9b4aa23e610397b4475b5f323179307c89099d7..231598d8f4532649070c8046f2f215dcd2b678bb 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -3,12 +3,16 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html))
+OUT_TEXI_FILES = $(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 
+include $(depth)/make/stepmake.make
 
-ifneq ($(out),www)
-LILYPOND='true'
+ifeq ($(out),www)
+local-WWW-1: $(OUT_TEXI_FILES)
 endif
 
-$(outdir)/NEWS.nexi: NEWS.tely
+.SECONDARY: