From 6deb72f988930b30d74a5415b0c5e428675522c0 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Thu, 18 Apr 2002 17:49:41 +0000 Subject: [PATCH] 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 --- build/fastgen.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build/fastgen.sh b/build/fastgen.sh index 3a2bf69121f..1df631022e6 100755 --- 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 <$makefile + if test -z "$dir"; then + cat - $top_srcdir/$makefile.in <$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 <$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 -- 2.47.3