X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fdoclang-rules.make;h=10fa6ef382ecc95622f0ab6abe94f313070089c4;hb=a407e62e234dab9bf3086be0487e83cad819725d;hp=1f4865d0099ae368e4bb01800f97e44921778dc2;hpb=e44f9f849d05d3169088f71f4960923b1da826c3;p=lilypond.git

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 1f4865d009..10fa6ef382 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,16 +1,25 @@
-$(outdir)/%/index.html: $(outdir)/%.texi
+$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
 	mkdir -p $(dir $@)
-	-$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
-$(outdir)/%-big-page.html: $(outdir)/%.texi
-	-$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
+$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi
+	$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
 
-$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
-	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
+$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi
+	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
 
 $(outdir)/%.pdf: $(outdir)/%.pdftexi
 	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
 
+$(outdir)/version.%: $(top-src-dir)/VERSION
+	echo '@macro version'> $@
+	echo $(TOPLEVEL_VERSION)>> $@
+	echo '@end macro'>> $@
+
+# This makes sure lilypond-doc gettext domain has been compiled
+# before lilypond-book runs
+%.tely: doc-po
+
 $(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)