lilypond-1.3.151

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 10f82f091d856b195afdb2e99edeac1bbf7fdf92..d607526ace5ce09912b2e1bd4e1ea12e0d668bef 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -6,3 +6,4 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly
 HTML_FILES=$(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html))
 
 include $(depth)/make/stepmake.make 
+

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 1dc1853f4434e519246e1d10a5a669ab5b08ecff..89789e350bf6c0ea80b9edd54a35803df195920d 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -121,11 +121,17 @@ local-clean:
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake
 ifneq ($(CROSS),yes)
-dummy:
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: dummy
+
+
+# there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time.
+# however, this triggers compilation during install, which  is a bad thing (tm).
+
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
        cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
+
+## unused
 $(outdir)/interfaces.itexi: dummy
        cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
 

diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make
index f1ab42266861dfaa434291365faa9c4f3b5fd198..c9d4e5c5f59932150e27b8cc7cee2c204ab33c5b 100644 (file)
--- a/stepmake/stepmake/documentation-targets.make
+++ b/stepmake/stepmake/documentation-targets.make
@@ -1,6 +1,7 @@
 
 default:
 
+# UGH. 
 include $(stepdir)/www-targets.make
 
 local-WWW: $(OUTHTML_FILES) footify

diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
index f820c182a4bd25827f298bbe45d62bb6777caddb..fd64b837c6adf1152f641b16583699a971fb848b 100644 (file)
--- a/stepmake/stepmake/topdocs-targets.make
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -6,8 +6,6 @@ copy-to-top:  $(TO_TOP_FILES)
          cp $(i) $(depth)/ && ) true
        -cp $(outdir)/*png $(outdir)/index.html $(depth)  # don't fail if not making website
 
-###local-WWW: copy-to-top
-
 local-WWW: $(HTML_FILES) copy-to-top
 # we want footers even if website builds (or is built) partly
        $(MAKE) footify