remove $(CROSS) support from

Documentation/user/GNUmakefile. Use --disable-documentation for that.

diff --git a/ChangeLog b/ChangeLog
index 46b515869081a9de914b8eaad91e359e2935969b..76f29e75f39f1e31ba1bec94338a16c6a3329e3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/GNUmakefile: remove $(CROSS) support from
+       Documentation/user/GNUmakefile. Use --disable-documentation for that.
+
+       * VERSION (PATCH_LEVEL): release 2.7.36
+
        * lily/slur.cc: add avoid-slur (ugh.)
        
        * lily/slur-configuration.cc (fit_factor): oops, skip point if

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 31094c6bb7ab0c806326dc52631712755753d270..4f4b96708ceb6f92f5f9f3aa0d500698c7f49cb8 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -250,9 +250,6 @@ $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 $(outdir)/music-glossary.nexi:
 
 # Rules for the automatically generated documentation
-# When cross-compiling, we don't have lilypond, so we fake
-ifneq ($(CROSS),yes)
-
 
 # There used to be a dependency on a dummy target, to force a rebuild
 # of lilypond-internals every time.  however, this triggers
@@ -268,15 +265,6 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_
 $(outdir)/interfaces.itexi: dummy
        cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
 
-else
-
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
-       touch $@
-       touch $(outdir)/$(*F).nexi
-
-$(outdir)/programming-interface.texi:
-       cp dummy-interfaces.itexi $@
-endif
 
 local-clean: local-delete