From: Graham Percival <graham@percival-music.ca>
Date: Tue, 21 Mar 2017 05:34:13 +0000 (-0700)
Subject: build: import bib-itexi files from LILYPOND_WEB_MEDIA_GIT repo
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=6f2cc023f43f162f5624af1e34dbd6bba65aec30

build: import bib-itexi files from LILYPOND_WEB_MEDIA_GIT repo

This reduces the build requirements for the website, as it appears
that bibtex is no longer included on that server.
---

diff --git a/make/website.make b/make/website.make
index 3e8df628d5..6a4eee7496 100644
--- a/make/website.make
+++ b/make/website.make
@@ -77,6 +77,7 @@ 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) $<
@@ -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 $< $@