Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / make / doclang-rules.make

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 36a53f956a41276359313bf065f45573a9a00518..33101c46b9c68321f58f52b4ad5ab3e39a2be4f7 100644 (file)
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:make/doclang-rules.make
 $(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi
        mkdir -p $(dir $@)
        $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
@@ -8,7 +9,7 @@ $(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.
        cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi
-       $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
+       $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
 
 $(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
@@ -21,6 +22,10 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
 $(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: doc-po
+
 $(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)