aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2002-12-19 00:50:33 +0000
committerH.J. Lu <hjl.tools@gmail.com>2002-12-19 00:50:33 +0000
commitefeae3db62cde77fe11a1dc4e04d04303ad34dee (patch)
tree97028690504ffb65848db4a9038327a1444b2ed8
parent32504c66e098b6739ddd311ee23f0ec30071f544 (diff)
downloadgdb-efeae3db62cde77fe11a1dc4e04d04303ad34dee.zip
gdb-efeae3db62cde77fe11a1dc4e04d04303ad34dee.tar.gz
gdb-efeae3db62cde77fe11a1dc4e04d04303ad34dee.tar.bz2
2002-12-18 H.J. Lu <hjl@gnu.org>
* Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR). * Makefile.in: Regenerated. * configure.in (build_prefix): New. Substitute.
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.in2
-rw-r--r--Makefile.tpl2
-rw-r--r--configure.in5
4 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f713321..0b07992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-18 H.J. Lu <hjl@gnu.org>
+
+ * Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR).
+ * Makefile.in: Regenerated.
+
+ * configure.in (build_prefix): New. Substitute.
+
2002-12-18 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Don't let real targets depend on phony targets.
diff --git a/Makefile.in b/Makefile.in
index 400c875..a2265d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1234,7 +1234,7 @@ TAGS: do-TAGS
.PHONY: configure-build-libiberty maybe-configure-build-libiberty
maybe-configure-build-libiberty:
configure-build-libiberty: $(BUILD_SUBDIR)/libiberty/Makefile
-$(BUILD_SUBDIR)/libiberty/Makefile: config.status
+@build_prefix@$(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 1a75885..d656c50 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -791,7 +791,7 @@ TAGS: do-TAGS
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
maybe-configure-build-[+module+]:
configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
-$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
+@build_prefix@$(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 f16fe5b..fb379fc 100644
--- a/configure.in
+++ b/configure.in
@@ -168,6 +168,10 @@ 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.
@@ -1729,6 +1733,7 @@ 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%@host_configargs@%${hostargs}%