X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=924b391cbbe27bac37597458fffad054c5f88e15;hb=1ce025d8e1bf93e820270d7ed74fccc48fa4fc64;hp=ab788379a8e02f6fedd268ef27ab5a499d97ca3e;hpb=c20fff645e325d392d2588721144f4204d0ef9da;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ab788379a8..924b391cbb 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -25,7 +25,7 @@ $(outdir)/snippets/index.html: TEXI2HTML_FLAGS += -D short_toc
 
 ### Extra source files
 
-README_TOP_FILES= DEDICATION THANKS
+README_TOP_FILES= DEDICATION
 
 IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
 SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
@@ -111,18 +111,21 @@ $(outdir)/colorado.itexi:
 	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
 		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(outdir)/colorado.itexi \
+		-q \
 		$(src-dir)/essay/colorado.bib
 
 $(outdir)/computer-notation.itexi:
 	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
 		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(outdir)/computer-notation.itexi \
+		-q \
 		$(src-dir)/essay/computer-notation.bib
 
 $(outdir)/engravingbib.itexi:
 	BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2texi \
 		-s $(top-src-dir)/Documentation/lily-bib \
 		-o $(outdir)/engravingbib.itexi \
+		-q \
 		$(src-dir)/essay/engravingbib.bib
 
 $(outdir)/essay.texi: \
@@ -164,8 +167,6 @@ extra-local-help:
 	@echo
 
 info: $(INFO_FILES)
-	@echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
-	@echo export PYTHONPATH=$(PYTHONPATH)
 
 xml: $(outdir)/notation/notation.xml $(outdir)/internals/internals.xml
 
@@ -199,7 +200,7 @@ $(OUT_TXT_FILES): $(outdir)/%.txt: $(top-src-dir)/%
 	cp -f $< $@
 
 $(OUT_TXT_FILES:%.txt=%.html): $(outdir)/%.html: $(outdir)/%.txt
-	$(PYTHON) $(step-bindir)/text2html.py $<
+	$(buildscript-dir)/text2html $<
 
 # Explicitly list the dependencies on generated content
 $(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi
@@ -283,7 +284,7 @@ $(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
 # of internals every time.  however, this triggers
 # compilation during install, which is a bad thing (tm).
 
-$(outdir)/internals.texi: $(LILYPOND_BINARY)
+$(outdir)/internals.texi: $(LILYPOND_BINARY) $(INIT_LY_SOURCES) $(SCHEME_SOURCES)
 	cd $(outdir) && $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation" "generate-documentation.log"
 
 ###############################################
@@ -316,7 +317,8 @@ new-lang-dir:
 
 new-lang:
 # Also for updating/adding missing files
-	mkdir -p $(ISOLANG)
+	mkdir -p $(ISOLANG)/included
+	if test -z "`ls $(ISOLANG)/included`"; then touch $(ISOLANG)/included/.gitignore; fi
 	cp fr/GNUmakefile $(ISOLANG)
 	sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile
 	$(foreach i,$(TRANSLATION_DIRS),$(MAKE) new-lang-dir DIR=$(i) &&) :