The pedant in me wishes to see all extraneous trailing / go away.

So, if we are in the top-level makefile, don't add an extra trailing
slash to srcdir, builddir, or VPATH.  It's annoying.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94701 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/fastgen.sh b/build/fastgen.sh
index 3a2bf69121f1e11bb86d02e77acafe15502eea71..1df631022e6db112d663416bda57b007423052c5 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -97,16 +97,24 @@ else
     echo "creating $makefile"
     dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
     $mkdir_p "$dir/"
-
-    cat - $top_srcdir/$makefile.in <<EOF >$makefile
+    if test -z "$dir"; then
+        cat - $top_srcdir/$makefile.in <<EOF >$makefile
+top_srcdir   = $top_srcdir
+top_builddir = $top_builddir
+srcdir       = $top_srcdir
+builddir     = $top_builddir
+VPATH        = $top_srcdir
+EOF
+        dir="."
+    else
+        cat - $top_srcdir/$makefile.in <<EOF >$makefile
 top_srcdir   = $top_srcdir
 top_builddir = $top_builddir
 srcdir       = $top_srcdir/$dir
 builddir     = $top_builddir/$dir
 VPATH        = $top_srcdir/$dir
 EOF
-  
-    test -z "$dir" && dir="."
+    fi 
     touch $dir/.deps
   done
 fi