X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Fdoclang-rules.make;h=62321a0d9fc0d274eb6a5d087c8a6b4a1d5e88a1;hb=fecc6ecc2954607bef5885730bb53ae95360afb1;hp=bed4120fb90384d9e6900e0870a3c5eebdfec020;hpb=9f29a1b2e60cfe923bef98f547634af141d2f7d3;p=lilypond.git

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index bed4120fb9..62321a0d9f 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,21 +1,30 @@
-# cancel the rule that generates .n[o lilypond images t]exi files
-$(outdir)/%.nexi: $(ITELY_FILES) $(ITEXI_FILES)
-
-$(outdir)/%/index.html: $(outdir)/%.texi
+$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi
 	mkdir -p $(dir $@)
-	-$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
+	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-$(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 $(OUT_PNG_IMAGES) $(outdir)/version.itexi
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
+	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-$(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 $(outdir)/version.itexi
+	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
 
-$(outdir)/%.pdf: $(outdir)/%.pdftexi
+$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
 	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
 
-$(OUT_TEXI_FILES): $(ITELY_FILES)
+$(outdir)/version.%: $(top-src-dir)/VERSION
+	echo '@macro version'> $@
+	echo $(TOPLEVEL_VERSION)>> $@
+	echo '@end macro'>> $@
+
+$(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
+	ln -f $< $@
+
+# This makes sure lilypond-doc gettext domain has been compiled
+# before lilypond-book runs
+$(TELY_FILES): doc-po
 
-$(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)
+$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 .SECONDARY: