X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=423b5514278297af0dfee1c8b7e8ccd3c98c6819;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=dede467bd2463168913f70de03b4edb0ba3fe645;hpb=75d292456d62fd2f5c15042c030c390e8bca1e24;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index dede467bd2..423b551427 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -1,28 +1,18 @@
 depth = ..
 
 NAME = documentation
-SUBDIRS=user bibliography pictures topdocs 
+SUBDIRS=user bibliography pictures topdocs  misc
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
-README_TOP_FILES=NEWS DEDICATION ChangeLog
-EXTRA_DIST_FILES=
+README_TOP_FILES= DEDICATION THANKS ChangeLog
+EXTRA_DIST_FILES= texinfo.css
 
 include $(depth)/make/stepmake.make 
 
 default: local-doc
 
-wiki-dump = $(outdir)/wiki-dump/LilyPond.html
-#wiki-slurp: $(wiki-dump)
-
-$(wiki-dump):
-	mkdir -p $(outdir)/wiki-dump
-	$(PYTHON) $(buildscript-dir)/wiki-slurp.py -d $(outdir)/wiki-dump 'http://lilypond.org/wiki/?' 'http://lilypond.org/wiki/'
-foe:
-	mkdir -p $(outdir)/wiki-dump/images
-	ln -f $(builddir)/Documentation/pictures/$(outbase)/lelie-icon.png $(outdir)/wiki-dump/images/wikibase.png
-
-local-WWW: copy-for-me txt-to-html $(PS_GZ_FILES) $(PDF_FILES) footify
+local-WWW: copy-for-me txt-to-html $(outdir)/index.html
 
 local-WWW-clean: deep-WWW-clean
 
@@ -30,11 +20,10 @@ 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 $(top-src-dir)/$(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)
-	$(footify) $(addprefix $(outdir)/, $(addsuffix .html, $(README_TOP_FILES)))