From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 19 Dec 2005 23:55:02 +0000 (+0000)
Subject: ($(tree-share-prefix)/mf-link-tree link-mf-tree):
X-Git-Tag: release/2.7.25~27
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=4ba2e956462f331726dc0aaf30006f4f03a4429b;p=lilypond.git

($(tree-share-prefix)/mf-link-tree link-mf-tree):
separate target for making font symlinks.
(documentation-dir): use $(if $(findstring )) for switching off
Documentation.
---

diff --git a/ChangeLog b/ChangeLog
index a07a44dc4f..f3b213e75b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):
 	separate target for making font symlinks.
+	(documentation-dir): use $(if $(findstring )) for switching off
+	Documentation.
 
 	* stepmake/stepmake/help2man-vars.make (OUT_DIST_FILES): only do
 	something if DOCUMENTATION is no.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1b0fabe60d..773f191766 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -9,11 +9,12 @@ SUBDIRS = buildscripts python scripts \
 	po make \
 	elisp vim \
 	input \
-	cygwin stepmake
+	cygwin stepmake $(documentation-dir)
 
-ifneq ($(strip $(DOCUMENTATION)),no)
-SUBDIRS += Documentation
-endif
+
+## this convoluted construction is necessary, since we don't know the
+## value of DOCUMENTATION here.
+documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
 README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING