X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fwebsite.make;h=3e8df628d564f956f0be839224a947ae082b1c54;hb=c16c8655784da3f7d1d20640ef0208a36bdeeaee;hp=2319c9b1089101d287d8ec819e122e774e9dd806;hpb=734f5255777e8c85676ad3f24fcd214a62a35862;p=lilypond.git diff --git a/make/website.make b/make/website.make index 2319c9b108..3e8df628d5 100644 --- a/make/website.make +++ b/make/website.make @@ -68,11 +68,11 @@ 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 @@ -156,7 +156,6 @@ root-files = $(OUT)/.htaccess \ $(OUT)/website/.htaccess \ $(OUT)/website/favicon.ico \ $(OUT)/website/tweets.xml \ - $(OUT)/website/tweets-es.xml \ $(OUT)/website/robots.txt texinfo-files = $(OUT)/index.html $(WEB_LANGS:%=$(OUT)/%/index.html) @@ -253,12 +252,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)" $$<; ) \ )) @@ -294,9 +293,6 @@ $(OUT)/website/robots.txt: $(SERVER_FILES)/robots.txt $(OUT)/website/tweets.xml: $(SERVER_FILES)/tweets.xml cp $< $@ -$(OUT)/website/tweets-es.xml: $(SERVER_FILES)/tweets-es.xml - cp $< $@ - $(OUT)/.htaccess: $(top-htaccess) cp $< $@