From dc91d47014cedc08ff233aceae9b5d7eee3b5cfd Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Thu, 4 May 2000 16:08:10 +0000
Subject: [PATCH] Remove trailing slash(es) from pathnames

---
 acinclude.m4     | 6 ++++--
 build/fastgen.sh | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 6ce670f417b..decf086f4e5 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
diff --git a/build/fastgen.sh b/build/fastgen.sh
index 9261e1a9a6c..c8bf431e76b 100755
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -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 @@ fi
 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