From 21315eff86cedc692b2b1ed999eafdf8dbd60ff5 Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Mon, 19 Mar 2012 20:18:16 +0100
Subject: [PATCH] Don't copy GNUmakefile and *.make from within builddir to
 builddir

---
 stepmake/aclocal.m4 | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index f7f457926a..490e2066ef 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -417,9 +417,22 @@ EOF
 	    exit 2
 	fi
 
+	abssrcdir="`cd $srcdir; pwd`"
+	absbuilddir="`pwd`"
 	for d in 2 3 4 ; do
 	    for mf in `cd $srcdir ; find . -maxdepth $d -mindepth $d -name GNUmakefile`; do
-		mkdir -p $(dirname $mf)
+		case "$abssrcdir" in
+		    "$absbuilddir"/*)
+# source is below build directory, always copy
+			;;
+		    *)
+			case "$abssrcdir/${mf#./}" in
+			    "$absbuilddir"/*)
+# find descended into build directory, don't copy
+				continue
+			esac
+		esac
+		mkdir -p ${mf%/*}
 	        cat <<EOF | $PYTHON -  > $mf
 print 'depth=' + ('../' * ( $d-1 ) )
 print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
@@ -428,7 +441,18 @@ print 'MODULE_INCLUDES += \$(src-dir)/\$(outbase)'
 EOF
 	    done
 	    for mf in `cd $srcdir ; find . -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do
-		mkdir -p $(dirname $mf)
+		case "$abssrcdir" in
+		    "$absbuilddir"/*)
+# source is below build directory, always copy
+			;;
+		    *)
+			case "$abssrcdir/${mf#./}" in
+			    "$absbuilddir"/*)
+# find descended into build directory, don't copy
+				continue
+			esac
+		esac
+		mkdir -p ${mf%/*}
 	        cat <<EOF | $PYTHON -  > $mf
 print 'include \$(depth)/config\$(if \$(conf),-\$(conf),).make'
 print 'include \$(configure-srcdir)/$mf'
-- 
2.39.2