Backport:

	2006-06-15  Daniel Jacobowitz  <dan@codesourcery.com>
	* Makefile.def (fixincludes): Correct extra_configure_flags
	typo.
	(expat): Don't install.  Don't build shared libraries.
	* Makefile.in: Regenerated.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 63086bc433bcf5198f1671ae859e644df4cc0ab0..0e5d38a22c47edec2c280ae2d8d1c9ec70ce1825 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,12 @@
+2006-10-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       Backport:
+       2006-06-15  Daniel Jacobowitz  <dan@codesourcery.com>
+       * Makefile.def (fixincludes): Correct extra_configure_flags
+       typo.
+       (expat): Don't install.  Don't build shared libraries.
+       * Makefile.in: Regenerated.
+
 2006-09-28  Daniel Jacobowitz  <dan@codesourcery.com>
 
        gdb/

diff --git a/Makefile.def b/Makefile.def
index 3c87dce68dd7ed885d08797d32ac476fe5ec8ab1..d25df408e85676a213311553b25f3cd0e6fd47a9 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -47,7 +47,8 @@ host_modules= { module= dejagnu; };
 host_modules= { module= diff; };
 host_modules= { module= dosutils; no_check= true; };
 host_modules= { module= etc; };
-host_modules= { module= expat; };
+host_modules= { module= expat; no_install= true;
+               extra_configure_flags='--disable-shared'; };
 host_modules= { module= fastjar; no_check_cross= true; };
 host_modules= { module= fileutils; };
 host_modules= { module= findutils; };

diff --git a/Makefile.in b/Makefile.in
index 15a98abc0b2790721ee1685054c55aecda888905..59f561a30466b2defa2316ab8c4ffdec3c8efa19 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -8392,7 +8392,7 @@ configure-expat:
        srcdiroption="--srcdir=$${topdir}/expat"; \
        libsrcdir="$$s/expat"; \
        $(SHELL) $${libsrcdir}/configure \
-         $(HOST_CONFIGARGS) $${srcdiroption}  \
+         $(HOST_CONFIGARGS) $${srcdiroption} --disable-shared \
          || exit 1
 @endif expat
 
@@ -8437,13 +8437,7 @@ maybe-install-expat:
 @if expat
 maybe-install-expat: install-expat
 
-install-expat: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd $(HOST_SUBDIR)/expat && \
-         $(MAKE) $(FLAGS_TO_PASS)  install)
+install-expat:
 
 @endif expat