diff options
| author | Adam Harvey <aharvey@php.net> | 2013-06-23 11:04:10 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-06-23 11:04:10 -0700 |
| commit | 296a12efbbdcb4db4a28b5744e3f3bd60e8fec9f (patch) | |
| tree | a02eb5680c90586489eb961adc15d080232cfb36 /acinclude.m4 | |
| parent | fc898ee0f94ee3686aa1f359d4a973d5e8e1754b (diff) | |
| parent | 2531307be601b95a4aac38dc26dd2d27112b9291 (diff) | |
| download | php-git-296a12efbbdcb4db4a28b5744e3f3bd60e8fec9f.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b545f06944..6c97dc37c6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -66,10 +66,10 @@ AC_DEFUN([PHP_EXPAND_PATH],[ $2=$1 else changequote({,}) - ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'` changequote([,]) - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - $2="$ep_realdir/`basename \"$1\"`" + ep_realdir=`(cd "$ep_dir" && pwd)` + $2="$ep_realdir"/`basename "$1"` fi ]) |