summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.def2
-rw-r--r--Makefile.in22
3 files changed, 6 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index e124bf75167..e176c104f03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-23 DJ Delorie <dj@redhat.com>
+
+ * Makefile.def (target_modules) [libiberty]: Don't stage.
+ * Makefile.in: Rebuilt.
+
2004-01-23 Jeff Johnston <jjohnstn@redhat.com>
* COPYING.NEWLIB: Update to include copyrights for new
diff --git a/Makefile.def b/Makefile.def
index 319711a05ad..f9a7f2fcbe3 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -107,7 +107,7 @@ target_modules = { module= libtermcap; no_check=true; stage=true;
missing=maintainer-clean; };
target_modules = { module= winsup; };
target_modules = { module= libgloss; no_check=true; };
-target_modules = { module= libiberty; stage=true; };
+target_modules = { module= libiberty; };
target_modules = { module= gperf; };
target_modules = { module= examples; no_check=true; no_install=true; };
target_modules = { module= libffi; };
diff --git a/Makefile.in b/Makefile.in
index 33f87b6aac8..e9fa3d74d2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22560,30 +22560,8 @@ configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
*) topdir="../../$(srcdir)" ;; \
esac ;; \
esac; \
- if [ "$(srcdir)" = "." ] ; then \
- if [ "$(TARGET_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \
- if [ -f Makefile ]; then \
- if $(MAKE) distclean; then \
- true; \
- else \
- exit 1; \
- fi; \
- else \
- true; \
- fi; \
- else \
- exit 1; \
- fi; \
- else \
- true; \
- fi; \
- srcdiroption="--srcdir=."; \
- libsrcdir="."; \
- else \
srcdiroption="--srcdir=$${topdir}/libiberty"; \
libsrcdir="$$s/libiberty"; \
- fi; \
rm -f no-such-file || : ; \
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) $${srcdiroption} \