X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=6a4eee7496ad10e4a6058d7804224ff72dd9d34b;hb=HEAD;hp=ad11f04379fc1937646e82df063417a92fb566c7;hpb=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git

diff --git a/make/website.make b/make/website.make
index ad11f04379..6a4eee7496 100644
--- a/make/website.make
+++ b/make/website.make
@@ -68,15 +68,16 @@ EXTRACT_TEXI_FILENAMES=$(PYTHON) $(script-dir)/extract_texi_filenames.py $(quiet
 		-I $(dir $<) \
 		-I $(OUT) \
 		-o $(OUT)
-CREATE_VERSION=python $(script-dir)/create-version-itexi.py
-CREATE_WEBLINKS=python $(script-dir)/create-weblinks-itexi.py
-MASS_LINK=python $(script-dir)/mass-link.py
-WEB_POST=python $(script-dir)/website_post.py
-WEB_BIBS=python $(script-dir)/bib2texi.py
+CREATE_VERSION=$(PYTHON) $(script-dir)/create-version-itexi.py
+CREATE_WEBLINKS=$(PYTHON) $(script-dir)/create-weblinks-itexi.py
+MASS_LINK=$(PYTHON) $(script-dir)/mass-link.py
+WEB_POST=$(PYTHON) $(script-dir)/website_post.py
+WEB_BIBS=$(PYTHON) $(script-dir)/bib2texi.py
 
 EXAMPLES=$(LILYPOND_WEB_MEDIA_GIT)/ly-examples
 PICTURES=$(LILYPOND_WEB_MEDIA_GIT)/pictures
 PDFS=$(LILYPOND_WEB_MEDIA_GIT)/pdf
+BIB_ITEXI=$(LILYPOND_WEB_MEDIA_GIT)/bib-itexi
 
 SERVER_FILES=$(top-src-dir)/Documentation/web/server
 
@@ -133,7 +134,8 @@ DO_TEXI_DEP = ( mkdir -p $(dir $@) && echo ./$@: $(call scan-texi,$<) > $@.dep )
 ###################
 ### Generated files
 
-bib-files = $(OUT)/others-did.itexi $(OUT)/we-wrote.itexi
+bib-itexi-src-files := $(notdir $(wildcard $(BIB_ITEXI)/*.itexi))
+bib-itexi-files = $(bib-itexi-src-files:%=$(OUT)/%)
 
 css-src-files := $(notdir $(wildcard $(top-src-dir)/Documentation/css/*.css))
 css-files = $(css-src-files:%=$(OUT)/website/css/%)
@@ -180,7 +182,7 @@ endif
 
 website: check-setup website-post website-examples website-pictures website-css website-misc website-pdf
 
-website-bibs: website-version $(OUT) $(bib-files)
+website-bibs: website-version $(OUT) $(bib-itexi-files)
 
 website-css: $(OUT)/website/css $(css-files)
 
@@ -221,14 +223,6 @@ $(OUT)/version.itexi: $(top-src-dir)/VERSION
 $(OUT)/weblinks.itexi: $(top-src-dir)/VERSION
 	$(CREATE_WEBLINKS) $(top-src-dir) > $(OUT)/weblinks.itexi
 
-$(bib-files): $(OUT)/%.itexi: $(top-src-dir)/Documentation/web/%.bib
-	BSTINPUTS=$(top-src-dir)/Documentation/web \
-		$(WEB_BIBS) -s web \
-		-s $(top-src-dir)/Documentation/lily-bib \
-		-o $@ \
-		$(quiet-flag) \
-		$<
-
 # Get xrefs for English tely manuals
 $(MANUALS_TELY:%.tely=$(OUT)/%.xref-map): $(OUT)/%.xref-map: $(top-src-dir)/Documentation/%.tely
 	$(DO_TEXI_DEP) $(EXTRACT_TEXI_FILENAMES) $<
@@ -252,12 +246,12 @@ $(OUT)/web.%.xref-map: $(top-src-dir)/Documentation/%/web.texi
 	$(DO_TEXI_DEP) $(EXTRACT_TEXI_FILENAMES) --split=node $<
 
 # Build the English website
-$(OUT)/index.html: $(top-src-dir)/Documentation/web.texi $(xref-files)
+$(OUT)/index.html: $(top-src-dir)/Documentation/web.texi $(version-files) $(xref-files)
 	$(DO_TEXI_DEP) $(TEXI2HTML) $<
 
 # Build translated websites
 $(eval $(foreach l,$(WEB_LANGS),\
-$(eval $(OUT)/$(l)/index.html: $(top-src-dir)/Documentation/$(l)/web.texi $(xref-files); \
+$(eval $(OUT)/$(l)/index.html: $(top-src-dir)/Documentation/$(l)/web.texi $(version-files) $(xref-files); \
 	$$(DO_TEXI_DEP) $$(TEXI2HTML) --lang="$(l)" $$<; ) \
 ))
 
@@ -269,6 +263,9 @@ $(OUT)/website/index.html: $(wildcard $(OUT)/*.html)
 	$(WEB_POST) $(OUT)/website
 
 # Simple copy
+$(bib-itexi-files): $(OUT)/%: $(BIB_ITEXI)/%
+	cp $< $@
+
 $(css-files): $(OUT)/website/css/%: $(top-src-dir)/Documentation/css/%
 	cp $< $@