Docs build: really put internals in rules chain

This should definitely fix build failures caused by missing
automatically generated documentation when lilypond-book compiles the
Notation Reference.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 7a9d67cefa90f6262a9c6dd962e58a352063a1e7..009dfd13a4e6cd5564372b52f18126de7af4ce07 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -50,6 +50,12 @@ TEXINFO_MANUALS = internals\
  $(TELY_FILES:%.tely=%)\
  $(TEXI_FILES:%.texi=%)
 
+## CHAIN_RULE hack: keep the following line *before* including
+# stepmake.make, so the Internals Reference is built before the
+# Notation Reference, thus providing automatically generated sections
+# of the NR
+TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
+
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 UNSPLITTED_HTML_MANUALS = changes
@@ -85,12 +91,6 @@ endif
 
 include $(depth)/make/stepmake.make
 
-## CHAIN_RULE hack: keep the following line *after* including
-# stepmake.make, so the Internals Reference is built before the
-# Notation Reference, thus providing automatically generated sections
-# of the NR
-TEXI_FILES_FROM_TELY += $(outdir)/internals.texi
-
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 ###########

diff --git a/make/ly-vars.make b/make/ly-vars.make
index 612a2b3e4015e6ded16d1860c0785ad229e7acd2..7d572adb750c212847b326e9729adb16288d46ab 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,7 +1,7 @@
 # rules for directories with LilyPond files.
 
 TELY_FILES := $(call src-wildcard,*.tely)
-TEXI_FILES_FROM_TELY += $(TELY_FILES:%.tely=$(outdir)/%.texi)
+TEXI_FILES_FROM_TELY := $(TELY_FILES:%.tely=$(outdir)/%.texi) $(TEXI_FILES_FROM_TELY)
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))