patch::: 1.3.137.jcn3

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 2259ace7e6668bf71fbb2698d886b12041ce07fe..db0ed79d93f4779b95940f0a8d0bc92e5e72986a 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -80,7 +80,7 @@ deep-symlinks:
        cd $(outdir) && rm -f lilypond && ln -s . lilypond
        cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals
        cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\
-               rm -f $(i) && ln -s $(i) lilypond.html &&) true
+               rm -f $(i) && ln -s lilypond.html $(i) &&) true
 endif
 
 
@@ -100,18 +100,17 @@ $(outdir)/%.bib: %.bib
 # we want footers even if website builds (or is built) partly
        $(MAKE) footify
 
-localclean:
+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
 
-#ugh. lily/OUT/lilypond hardcoded.
 # when cross-compiling, we don't have lilypond
 ifneq ($(CROSS),yes)
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
-       cd $(outdir) && ../$(depth)/$(builddir)/lily/out/lilypond ../$(src-depth)/ly/generate-documentation
+       cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 else
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: