X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=2fbfeeae1796434ed8df393ea26fa348502ef93d;hb=955f829883aa125b2b633b1e71f6256da5b773fa;hp=7f4113cdef09077bf2a444aa84dbb1a4221621c4;hpb=083af6fa3417381bcc28747fedd852ad526800de;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 7f4113cdef..2fbfeeae17 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,21 +1,29 @@
 depth = ..
 
 NAME = documentation
-SUBDIRS=user bibliography pictures topdocs ntweb misc
+SUBDIRS=user bibliography pictures topdocs  misc
 STEPMAKE_TEMPLATES=documentation texinfo tex
-LOCALSTEPMAKE_TEMPLATES=lilypond mudela
-
-README_TOP_FILES=NEWS DEDICATION CHANGES TODO
-EXTRA_DIST_FILES=
+LOCALSTEPMAKE_TEMPLATES=lilypond ly
+LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+README_TOP_FILES= DEDICATION ChangeLog
+EXTRA_DIST_FILES= 
 
 include $(depth)/make/stepmake.make 
 
 default: local-doc
 
-local-WWW: copy-for-me $(outdir)/regression-test.ps.gz $(outdir)/regression-test.html
-# we want footers even if website builds (or is built) partly
-	$(MAKE) footify
+local-WWW: copy-for-me txt-to-html $(outdir)/index.html
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+	rm -rf $(outdir)/wiki-dump
 
 copy-for-me:
-	$(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true
+	$(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true
+
+OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
+# cd $(outdir) rule gets bit hairy for --srcdir configure builds
+txt-to-html:
+	$(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)