From 9c19a7461cdc52b9f320abdf7db980c3efdb16a5 Mon Sep 17 00:00:00 2001
From: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 2 Jan 2006 18:34:24 +0000
Subject: [PATCH] * configure.in: When reconfiguring remove Makefile in
all stage directories. * configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109240 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog | 6 ++++++
configure | 11 +++++++----
configure.in | 13 ++++++++-----
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d868bfecfa62..9539f6181344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-02 Andreas Schwab <schwab@suse.de>
+
+ * configure.in: When reconfiguring remove Makefile in
+ all stage directories.
+ * configure: Regenerate.
+
2005-12-27 Steven Bosscher <stevenb.gcc@gmail.com>
* MAINTAINERS: Update my email address.
diff --git a/configure b/configure
index 9ff201061699..cadb668dd793 100755
--- a/configure
+++ b/configure
@@ -3012,10 +3012,13 @@ for module in ${build_configdirs} ; do
/^@endif build-$module-$bootstrap_suffix\$/d"
done
for module in ${configdirs} ; do
- if test -z "${no_recursion}" \
- && test -f ${module}/Makefile; then
- echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
- rm -f ${module}/Makefile
+ if test -z "${no_recursion}"; then
+ for file in stage*-${module}/Makefile ${module}/Makefile; do
+ if test -f ${file}; then
+ echo 1>&2 "*** removing ${file} to force reconfigure"
+ rm -f ${file}
+ fi
+ done
fi
extrasub="$extrasub
/^@if $module\$/d
diff --git a/configure.in b/configure.in
index ad7ec4d9a4dd..c3ef95b9ec28 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1802,10 +1802,13 @@ for module in ${build_configdirs} ; do
/^@endif build-$module-$bootstrap_suffix\$/d"
done
for module in ${configdirs} ; do
- if test -z "${no_recursion}" \
- && test -f ${module}/Makefile; then
- echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
- rm -f ${module}/Makefile
+ if test -z "${no_recursion}"; then
+ for file in stage*-${module}/Makefile ${module}/Makefile; do
+ if test -f ${file}; then
+ echo 1>&2 "*** removing ${file} to force reconfigure"
+ rm -f ${file}
+ fi
+ done
fi
extrasub="$extrasub
/^@if $module\$/d
--
GitLab