* config.make.in:

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index cf9bc30c40d021bdc73f6dcdca6ea9262c204384..aede92655651bc637803a55764eccd8d909f4d09 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)
@@ -725,7 +725,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     CONFIGSUFFIX=
     AC_ARG_ENABLE(config,
     [  --enable-config=CONF    put settings in config-CONF.make and config-CONF.h;
-                            do \`make conf=CONF' to get output in ./out-CONF],
+                            do `make conf=CONF' to get output in ./out-CONF],
     [CONFIGURATION=$enableval])
 
     ##'
@@ -769,14 +769,12 @@ AC_DEFUN(STEPMAKE_INIT, [
     LN=ln
     LN_S='ln -s'
     ZIP="zip -r -9"
-    INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
 
     AC_SUBST(program_prefix)
     AC_SUBST(program_suffix)
     AC_SUBST(ZIP)
     AC_SUBST(LN)
     AC_SUBST(LN_S)
-    AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
     AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
     AC_SUBST(DIRSEP)
@@ -810,12 +808,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
            ])
     
     kpathsea_b=yes
-    #FIXME --with-xxx is meant for specifying a PATH too,
-    # so this should read: --enable-kpathsea,
-    # or --with-kpathsea-include=PATH --with-kpathsea-lib=PATH
-    AC_ARG_WITH(kpathsea,
-    [  --with-kpathsea         use kpathsea lib.  Default: on],
-    [kpathsea_b=$with_kpathsea])
+    AC_ARG_ENABLE(kpathsea,
+    [  --enable-kpathsea         use kpathsea lib.  Default: on],
+    [kpathsea_b=$enableval])
 
     save_LIBS="$LIBS"
     if test "$kpathsea_b" != "no"; then        
@@ -1257,7 +1252,6 @@ AC_DEFUN(STEPMAKE_WINDOWS, [
 
     AC_SUBST(LN)
     AC_SUBST(LN_S)
-    AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
     AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
     AC_SUBST(DIRSEP)