* Makefile.def (target_modules) [libiberty]: Don't stage.

* Makefile.in: Rebuilt.

diff --git a/ChangeLog b/ChangeLog
index e124bf7516786150b69bc1e70b3c9e031959ac47..e176c104f037ae11f99e9113512a2405f2edc435 100644 (file)
--- 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 319711a05ad11e126751dbcbe38efcdd9a0c2ed1..f9a7f2fcbe3ed24c75b3fb68cec41ba668b39465 100644 (file)
--- 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 33f87b6aac80c81bc1440c90b15e1012c2a344ff..e9fa3d74d2d51199541c6e548dfae9207734f7fe 100644 (file)
--- 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} \