2003-03-14 Andreas Schwab <schwab@suse.de>

	* configure.in: Only append to makefiles that are newly created to
	avoid multiple multi-do/multi-clean rules.
	* configure: Rebuilt.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@64363 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 54 insertions, 9 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1ee7a05b369..c33de2709e4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-14  Andreas Schwab  <schwab@suse.de>
+
+	* configure.in: Only append to makefiles that are newly created to
+	avoid multiple multi-do/multi-clean rules.
+	* configure: Rebuilt.
+
 2003-03-13  Jonathan Wakely  <redi@gcc.gnu.org>
 
 	* docs/html/configopts.html, docs/html/documentation.html,
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index de8b7d1b7f6..05385ca9dcf 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -24270,9 +24270,22 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
  if test -n "$CONFIG_FILES"; then
    if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
      LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-     ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
-     grep '^MULTISUBDIR =' Makefile >> src/Makefile
-     grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+     # Ony modify Makefiles that are just being created.
+     case " $CONFIG_FILES" in
+       *" Makefile"*)
+	 ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+	 ;;
+     esac
+     case $CONFIG_FILES in
+       *src/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> src/Makefile
+	 ;;
+     esac
+     case $CONFIG_FILES in
+       *libsupc++/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+	 ;;
+     esac
    fi
  fi
  chmod +x mkcheck
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index b4ef860ef2e..279c9f46c63 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -477,9 +477,22 @@ po/Makefile testsuite/Makefile mkcheck testsuite_flags,
  if test -n "$CONFIG_FILES"; then
    if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
      LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-     ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
-     grep '^MULTISUBDIR =' Makefile >> src/Makefile
-     grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+     # Ony modify Makefiles that are just being created.
+     case " $CONFIG_FILES" in
+       *" Makefile"*)
+	 ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+	 ;;
+     esac
+     case $CONFIG_FILES in
+       *src/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> src/Makefile
+	 ;;
+     esac
+     case $CONFIG_FILES in
+       *libsupc++/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+	 ;;
+     esac
    fi
  fi
  chmod +x mkcheck
@@ -504,9 +517,22 @@ dnl      libmath/Makefile libio/Makefile libsupc++/Makefile \
 dnl      po/Makefile testsuite/Makefile mkcheck testsuite_flags)
 dnl  AC_CONFIG_COMMANDS([default],
 dnl  [if test -n "$CONFIG_FILES"; then
-dnl    ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
-dnl    grep '^MULTISUBDIR =' Makefile >> src/Makefile
-dnl    grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+dnl    # Ony modify Makefiles that are just being created.
+dnl    case " $CONFIG_FILES" in
+dnl      *" Makefile"*)
+dnl        ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+dnl        ;;
+dnl    esac
+dnl    case $CONFIG_FILES in
+dnl      *src/Makefile*)
+dnl        grep '^MULTISUBDIR =' Makefile >> src/Makefile
+dnl        ;;
+dnl    esac
+dnl    case $CONFIG_FILES in
+dnl      *libsupc++/Makefile*)
+dnl        grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+dnl        ;;
+dnl    esac
 dnl  fi
 dnl  chmod +x mkcheck
 dnl  chmod +x testsuite_flags