From: hanwen <hanwen>
Date: Wed, 16 Nov 2005 14:01:39 +0000 (+0000)
Subject: * stepmake/aclocal.m4: use $(if ) for config-FOOF.make
X-Git-Tag: release/2.7.20~47
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3823e4aaa8b83ffd64cc7830ac6fcf606e265988;p=lilypond.git

* stepmake/aclocal.m4: use $(if ) for config-FOOF.make

* stepmake/aclocal.m4: oops. Include $CONFIGFILE.make, not
config.make.
---

diff --git a/ChangeLog b/ChangeLog
index ffa525b3fc..a1d46bab13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* stepmake/aclocal.m4: use $(if ) for config-FOOF.make
+
 	* THANKS: add Eduardo Vieira & Ralph Little
 
 	* mf/feta-bolletjes.mf (solfa_quarter_width): make solfa heads
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index cf9bc30c40..c80c4cff8f 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -371,14 +371,14 @@ EOF
 		mkdir -p $(dirname $mf)
 	        cat <<EOF | $PYTHON -  > $mf
 print 'depth=' + ('../' * ( $d-1 ) )
-print 'include \$(depth)/$CONFIGFILE.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make
 print 'include \$(configure-srcdir)/$mf'
 EOF
 	    done
 	    for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do
 		mkdir -p $(dirname $mf)
 	        cat <<EOF | $PYTHON -  > $mf
-print 'include \$(depth)/$CONFIGFILE.make'
+print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
 print 'include \$(configure-srcdir)/$mf'
 EOF
 	    done
@@ -387,7 +387,7 @@ EOF
 	
 	cat <<EOF > GNUmakefile
 depth = ./
-include $CONFIGFILE.make
+include config\$(if \$(conf),-\$(conf),).make
 include \$(configure-srcdir)/GNUmakefile.in
 EOF
 	AC_SUBST(VPATH)