($(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 a07a44dc4f86dadf8c15de1173a7cb3b7aa3ac07..f3b213e75bbff3fb0cb54c20c4a2f9d9cf4cc180 100644 (file)
--- 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 1b0fabe60d941c391218d17dc4085bf2984a449d..773f1917669d5c744eebc8e3e4c93aa1ba507e07 100644 (file)
--- 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