diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6ce670f417..decf086f4e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -40,7 +40,7 @@ dnl Stores the location of libgcc in libgcc_libpath dnl AC_DEFUN(PHP_LIBGCC_LIBPATH,[ changequote({,}) - libgcc_libpath="`$1 --print-libgcc-file-name|sed 's%[^/][^/]*$%%'`" + libgcc_libpath="`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`" changequote([,]) ]) @@ -339,7 +339,9 @@ AC_DEFUN(AC_EXPAND_PATH,[ if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then $2="$1" else - ep_dir="`dirname \"$1\"`" + changequote({,}) + ep_dir="`echo $1|sed 's%/*[^/][^/]*$%%'`" + changequote([,]) ep_realdir="`(cd \"$ep_dir\" && pwd)`" $2="$ep_realdir/`basename \"$1\"`" fi |