X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=d4246294e5d7d2d3ab2c45602bee8cd9ca339324;hb=c58b9bd118958423656e674c25d940cdec71f58a;hp=ef979addab4852d1acb5408d5280f4ef57949835;hpb=297b650058417845745a706a49bae154cba80fd6;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ef979addab..d4246294e5 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -84,7 +84,7 @@ INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
-DEST_INFO_IMAGES_SUBDIR = Documentation/
+DEST_INFO_IMAGES_SUBDIR = Documentation
 endif
 
 include $(depth)/make/stepmake.make
@@ -92,13 +92,13 @@ include $(depth)/make/stepmake.make
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 
-### Web site idiosyncrases
+### Web site idiosyncrasies
 $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
 ### AJAX scripts
 JS_FILES = $(call src-wildcard,*.js)
 PHP_FILES = $(call src-wildcard,*.php)
-EXTRA_DIST_FILES += $(JS_FILES)
+EXTRA_DIST_FILES += $(JS_FILES) $(PHP_FILES)
 
 OUT_JS_FILES = $(JS_FILES:%.js=$(outdir)/%.js)
 OUT_PHP_FILES = $(PHP_FILES:%.php=$(outdir)/%.php)
@@ -111,24 +111,37 @@ $(outdir)/ROADMAP:
 $(outdir)/contributor.texi: $(outdir)/ROADMAP
 
 ### bad hack for badly-integrated bibliography
-$(outdir)/engravingbib.itexi:
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/colorado.html \
+$(outdir)/colorado.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-o $(outdir)/colorado.itexi \
 		$(src-dir)/essay/colorado.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/colorado.html > $(outdir)/colorado.itexi
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/computer-notation.html \
+
+$(outdir)/computer-notation.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-o $(outdir)/computer-notation.itexi \
 		$(src-dir)/essay/computer-notation.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/computer-notation.html > $(outdir)/computer-notation.itexi
-	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
-		-o $(outdir)/engravingbib.html \
+
+$(outdir)/engravingbib.itexi:
+	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
+		-o $(outdir)/engravingbib.itexi \
 		$(src-dir)/essay/engravingbib.bib
-	$(buildscript-dir)/html-to-texi \
-		< $(outdir)/engravingbib.html > $(outdir)/engravingbib.itexi
 
-$(outdir)/essay.texi: $(outdir)/engravingbib.itexi
+$(outdir)/essay.texi: \
+  $(outdir)/colorado.itexi \
+  $(outdir)/computer-notation.itexi \
+  $(outdir)/engravingbib.itexi
+
+$(outdir)/others-did.itexi:
+	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+		-s web \
+		-o $(outdir)/others-did.itexi \
+		$(src-dir)/web/others-did.bib
+
+$(outdir)/we-wrote.itexi:
+	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
+		-s web \
+		-o $(outdir)/we-wrote.itexi \
+		$(src-dir)/web/we-wrote.bib
 
 
 ###########
@@ -206,13 +219,19 @@ $(outdir)/pictures:
 	$(MAKE) -C pictures WWW-1
 	ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/ly-examples
-
 $(outdir)/ly-examples:
 	$(MAKE) -C web/ly-examples
 	ln -sf ../web/ly-examples/$(outdir) $@
 endif
 
+ifeq ($(out),www)
+$(outdir)/web.texi: $(outdir)/ly-examples $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+else
+# duplicate (without ly-examples)
+$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+endif
+
+
 # Ugh, using '%' twice not possible
 $(outdir)/notation/notation.xml: $(outdir)/notation.texi
 	mkdir -p $(dir $@)
@@ -239,7 +258,7 @@ $(outdir)/%/source:
 	ln -sf $(depth)/.. $(@)
 
 
-## Snippets rules idiosyncrases
+## Snippets rules idiosyncrasies
 $(outdir)/%.itely: snippets/%-intro.itely snippets/%.snippet-list
 	xargs $(LYS_TO_TELY) -f doctitle,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)