* Makefile.tpl: Revert HJL's change.
* Makefile.in: Regenerated. * configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and always.
This commit is contained in:
parent
262a8bfcf2
commit
93a1293bc1
|
@ -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>
|
2002-12-19 Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
|
* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
|
||||||
|
|
|
@ -1235,7 +1235,7 @@ TAGS: do-TAGS
|
||||||
.PHONY: configure-build-libiberty maybe-configure-build-libiberty
|
.PHONY: configure-build-libiberty maybe-configure-build-libiberty
|
||||||
maybe-configure-build-libiberty:
|
maybe-configure-build-libiberty:
|
||||||
configure-build-libiberty: $(BUILD_SUBDIR)/libiberty/Makefile
|
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;\
|
@[ -d $(BUILD_SUBDIR)/libiberty ] || mkdir $(BUILD_SUBDIR)/libiberty;\
|
||||||
r=`${PWD}`; export r; \
|
r=`${PWD}`; export r; \
|
||||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||||
|
|
|
@ -792,7 +792,7 @@ TAGS: do-TAGS
|
||||||
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
|
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
|
||||||
maybe-configure-build-[+module+]:
|
maybe-configure-build-[+module+]:
|
||||||
configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
|
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+];\
|
@[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
|
||||||
r=`${PWD}`; export r; \
|
r=`${PWD}`; export r; \
|
||||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||||
|
|
|
@ -156,7 +156,8 @@ if test ! -d ${target_subdir} ; then
|
||||||
fi
|
fi
|
||||||
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 x"${build_alias}" != x"${host}" ; then
|
||||||
if test ! -d ${build_subdir} ; then
|
if test ! -d ${build_subdir} ; then
|
||||||
|
@ -168,10 +169,6 @@ if test x"${build_alias}" != x"${host}" ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"${target_subdir}" = x"${build_subdir}" ; then
|
|
||||||
build_prefix=build-
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Skipdirs are removed silently.
|
# Skipdirs are removed silently.
|
||||||
skipdirs=
|
skipdirs=
|
||||||
# Noconfigdirs are removed loudly.
|
# 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%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}%
|
||||||
s%@target_subdir@%${target_subdir}%
|
s%@target_subdir@%${target_subdir}%
|
||||||
s%@build_subdir@%${build_subdir}%
|
s%@build_subdir@%${build_subdir}%
|
||||||
s%@build_prefix@%${build_prefix}%
|
|
||||||
s%@build_configargs@%${buildargs}%
|
s%@build_configargs@%${buildargs}%
|
||||||
s%@gxx_include_dir@%${gxx_include_dir}%
|
s%@gxx_include_dir@%${gxx_include_dir}%
|
||||||
s%@libstdcxx_incdir@%${libstdcxx_incdir}%
|
s%@libstdcxx_incdir@%${libstdcxx_incdir}%
|
||||||
|
|
Loading…
Reference in New Issue