Makefile.tpl: Revert HJL's change.

	* Makefile.tpl: Revert HJL's change.
	* Makefile.in: Regenerated.
	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and
	always.

From-SVN: r60326

diff --git a/ChangeLog b/ChangeLog
index 7d790bdb3cbbef8cb45c8ad283c071372d0b9fcd..64305d1b6399d86c8c3333e8c0bd78cc6795ce26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-29  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 4466ec84161a11e4cbdc20fd33e469d63cdfefed..64b0657ef12fee0d1f4db8039d2c5bca8e21590b 100644 (file)
--- 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 de5291f54de37058b732b8cb05af5977e6acbf1e..d4edeed1e07cd1dea72bf2ff7a61a87779cdbd75 100644 (file)
--- 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 8276a4586dc96ca05577d75a8b6db4b29165c116..82cca6c2383a2aa8a4cc0540a8bd45fa81713ac8 100644 (file)
--- 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}%