X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=be97fa96de6dc2b1ff96b03d69f21050b5efa6e9;hb=bb931bde01b84a88d2789a639df4b5be134fa17f;hp=96959c09f7443eaefcaddd1eb8eba9961e13f0e4;hpb=16be499f5baf84345b36440e41c41a67a14ff2ff;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 96959c09f7..be97fa96de 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -32,7 +32,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
     ## for compatibility reasons.
     
     ## grab the first version number in  --version output.
-    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep ' [0-9][0-9]*\.[0-9]' \
+    eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '\(^\| \)[0-9][0-9]*\.[0-9]' \
         | head -n 1 \
 	| tr ' ' '\n' | grep '[0-9]\.[0-9]' | head -n 1 | sed 's/\([0-9.]*\).*/\1/g'\`\"
 
@@ -668,7 +668,11 @@ AC_DEFUN(STEPMAKE_INIT, [
 
 	AC_MSG_CHECKING(builddir)
 	ugh_ugh_autoconf250_builddir="`pwd`"
-	if test "$srcdir" = "."; then
+
+	here_dir=$(cd . && pwd)
+	full_src_dir=$(cd $srcdir && pwd)
+
+	if test "$full_src_dir" = "$here_dir"; then
 	    srcdir_build=yes
 	else
 	    srcdir_build=no