cvs: /php4 acinclude.m4 /php4/build fastgen.sh

sas Thu May 4 09:08:10 2000 EDT Modified files: /php4 acinclude.m4 /php4/build fastgen.sh Log: Remove trailing slash(es) from pathnames Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.78 php4/acinclude.m4:1.79 --- php4/acinclude.m4:1.78 Thu May 4 03:38:12 2000 +++ php4/acinclude.m4 Thu May 4 09:08:10 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.78 2000/05/04 10:38:12 sas Exp $ +dnl $Id: acinclude.m4,v 1.79 2000/05/04 16:08:10 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -40,7 +40,7 @@ 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 @@ 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 Index: php4/build/fastgen.sh diff -u php4/build/fastgen.sh:1.3 php4/build/fastgen.sh:1.4 --- php4/build/fastgen.sh:1.3 Sat Apr 29 20:10:34 2000 +++ php4/build/fastgen.sh Thu May 4 09:08:10 2000 @@ -23,7 +23,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: fastgen.sh,v 1.3 2000/04/30 03:10:34 sas Exp $ +# $Id: fastgen.sh,v 1.4 2000/05/04 16:08:10 sas Exp $ # srcdir=$1 @@ -44,7 +44,7 @@ for makefile in $@; do echo "creating $makefile" # portable dirname - dir=echo $makefile|sed 's%[^/][^/]*$%%' + dir=echo $makefile|sed 's%/*[^/][^/]*$%%' test -d "$dir/" || $mkdir_p "$dir/" (cat <<EOF