diff options
author | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-12-19 20:23:50 +0000 |
---|---|---|
committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-12-19 20:23:50 +0000 |
commit | 346b290d6dccda980ae6e655527614e602a1cd72 (patch) | |
tree | 56922f4ec7f0d2e497c28cb02990b62a69d5f303 /configure.in | |
parent | 598119bb209b0904c55799ed8eb9310a9d30e186 (diff) | |
download | gcc-346b290d6dccda980ae6e655527614e602a1cd72.zip gcc-346b290d6dccda980ae6e655527614e602a1cd72.tar.gz gcc-346b290d6dccda980ae6e655527614e602a1cd72.tar.bz2 |
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
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 8276a45..82cca6c 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}% |