From 93a1293bc109af9ffaef47116f83f24effd7d70b Mon Sep 17 00:00:00 2001
From: Nathanael Nerode <neroden@gcc.gnu.org>
Date: Thu, 19 Dec 2002 20:27:11 +0000
Subject: [PATCH] 	* Makefile.tpl: Revert HJL's change. 	* Makefile.in:
 Regenerated. 	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here,
 and 	always.

---
 ChangeLog    | 7 +++++++
 Makefile.in  | 2 +-
 Makefile.tpl | 2 +-
 configure.in | 8 ++------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f410ed88..4a3471e2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Revert HJL's change.
+	* Makefile.in: Regenerated.
+	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and
+	always.
+
 2002-12-19  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
diff --git a/Makefile.in b/Makefile.in
index 4466ec841..64b0657ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1235,7 +1235,7 @@ TAGS: do-TAGS
 .PHONY: configure-build-libiberty maybe-configure-build-libiberty
 maybe-configure-build-libiberty:
 configure-build-libiberty: $(BUILD_SUBDIR)/libiberty/Makefile
-@build_prefix@$(BUILD_SUBDIR)/libiberty/Makefile: config.status
+$(BUILD_SUBDIR)/libiberty/Makefile: config.status
 	@[ -d $(BUILD_SUBDIR)/libiberty ] || mkdir $(BUILD_SUBDIR)/libiberty;\
 	    r=`${PWD}`; export r; \
 	    s=`cd $(srcdir); ${PWD}`; export s; \
diff --git a/Makefile.tpl b/Makefile.tpl
index de5291f54..d4edeed1e 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -792,7 +792,7 @@ TAGS: do-TAGS
 .PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
 maybe-configure-build-[+module+]:
 configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
-@build_prefix@$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
+$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
 	@[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
 	    r=`${PWD}`; export r; \
 	    s=`cd $(srcdir); ${PWD}`; export s; \
diff --git a/configure.in b/configure.in
index 8276a4586..82cca6c23 100644
--- a/configure.in
+++ b/configure.in
@@ -156,7 +156,8 @@ if test ! -d ${target_subdir} ; then
   fi
 fi
 
-build_subdir=${build_alias}
+build_prefix=build-
+build_subdir=${build_prefix}${build_alias}
 
 if test x"${build_alias}" != x"${host}" ; then
   if test ! -d ${build_subdir} ; then
@@ -168,10 +169,6 @@ if test x"${build_alias}" != x"${host}" ; then
   fi
 fi
 
-if test x"${target_subdir}" = x"${build_subdir}" ; then
-  build_prefix=build-
-fi
-
 # Skipdirs are removed silently.
 skipdirs=
 # Noconfigdirs are removed loudly.
@@ -1733,7 +1730,6 @@ s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}%
 s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}%
 s%@target_subdir@%${target_subdir}%
 s%@build_subdir@%${build_subdir}%
-s%@build_prefix@%${build_prefix}%
 s%@build_configargs@%${buildargs}%
 s%@gxx_include_dir@%${gxx_include_dir}%
 s%@libstdcxx_incdir@%${libstdcxx_incdir}%