* config.make.in (datadir): Add datarootdir to silence autoconf.

[lilypond.git] / stepmake / aclocal.m4

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 19b9200a40d4b696cb16f319afe7f18710209d7a..93e568bb6cf542030eda86ca41b8e698b5f7179b 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,8 +32,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## FIXME: what systems still do not have $() in /bin/sh?
     eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\.[0-9]' \
         | head -n 1 \
-        | sed -e 's/\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
-         -e 's/\([^0-9]*\|^\) //' -e 's/[^0-9]*$//'\`\"
+       | sed -e 's/.*[^-.0-9]\([0-9][0-9]*\.[0-9][.0-9]*\).*/\1/' \
+           -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
     if test -z "$_ver"; then
         ## If empty, try date [fontforge]
         eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \