*** empty log message ***

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c3d41f612876775958d33ba4fd05e507d24eeaf0..73f7aa94bedda2ee38cc6fb95caac8d64592d4f9 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -27,6 +27,10 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
 
     changequote(<<, >>)#dnl
 
+    ## Assume and hunt for dotted version multiplet.
+    ## use eval trickery, because we cannot use multi-level $() instead of ``
+    ## for compatibility reasons.
+    
     ## grab the first version number in  --version output.
     eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
         | head -n 1 \
@@ -284,7 +288,7 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
-    DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+    DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)