* 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 ffa525b3fcf68868d44e26f6807e6d11ecedfaba..a1d46bab139a52c96ad4a27a2f8aa9e9a5f3fa4f 100644 (file)
--- 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 cf9bc30c40d021bdc73f6dcdca6ea9262c204384..c80c4cff8fe0f752849ecc38e56e4f64d5ead1ba 100644 (file)
--- 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)