patch::: 1.3.140.jcn5

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index db0ed79d93f4779b95940f0a8d0bc92e5e72986a..08a4b139c5f009ec8efee3a497397a8645097d92 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -5,7 +5,6 @@ depth=../..
 
 LATEX_FILES =$(wildcard *.latex)
 
-
 # todo: add latex.
 DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
 
@@ -22,8 +21,18 @@ INFO_FILES = $(addprefix $(outdir)/, lilypond.info lilypond-internals.info)
 STEPMAKE_TEMPLATES=tex texinfo documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
+# Hmm, what about?
+# local-dist: check-info
+
+info: check-info
+
 include $(depth)/make/stepmake.make 
 
+# Ugh,ugh.
+# emacs cannot fix the menu structure when @mbinclude is used
+# lilypond.tely uses mbinclude
+TEXINFO_SOURCES := $(filter-out lilypond.tely, $(TEXINFO_SOURCES))
+
 dvi: $(DVI_FILES)
 
 ps: $(PS_FILES)
@@ -37,7 +46,7 @@ $(outdir)/%.info: $(outdir)/%.texi
 default: 
 
 # Info is now built by default via texinfo-rules.
-# We must build them by default, otherwise they get built during make install
+# We must build them by defaulbt, otherwise they get built during make install
 info: $(INFO_FILES)
 
 
@@ -50,13 +59,13 @@ SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a)')
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
-       -$(MAKEINFO) --force --output=$@ --html $<
+       $(MAKEINFO) --output=$@ --html $<
        -cp -f $(outdir)/*.png $(outdir)/lilypond
        -cp -f $(outdir)/lilypond/index.html $@
        $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
-       -$(MAKEINFO) --force --output=$@ --html $<
+       $(MAKEINFO) --output=$@ --html $<
        -cp -f $(outdir)/*.png $(outdir)/lilypond-internals
        -cp -f $(outdir)/lilypond-internals/index.html $@
        $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
@@ -84,16 +93,18 @@ deep-symlinks:
 endif
 
 
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES)
+local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+
+local-WWW-clean: deep-WWW-clean
+
+deep-WWW-clean:
+       rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
+
+info-dir:
        $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
        $(MAKE) footify
        $(MAKE) deep-footify
 
-#      $(PYTHON) $(step-bindir)/ls-latex.py --title 'User documentation' \
-#         $(DOC_FILES) $(TEX_FILES) $(TELY_FILES) \
-#        | sed "s!$(outdir)/!!g" > $(outdir)/index.html
-
-
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
@@ -104,9 +115,6 @@ local-clean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
-backdoc-WWW: $(outdir)/lilypond-internals/lilypond-internals.html
-       $(SHELL) $(buildscript-dir)/install-info-html.sh --dir=$(outdir) lilypond lilypond-internals
-
 # when cross-compiling, we don't have lilypond
 ifneq ($(CROSS),yes)
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: