From: Daniel Jacobowitz <drow@false.org>
Date: Thu, 15 Jun 2006 20:38:13 +0000 (+0000)
Subject: 	* Makefile.def (fixincludes): Correct extra_configure_flags
X-Git-Tag: gdb-csl-sourcerygxx-3_4_4-21~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1dd10dead18442d098a04810323a79c8b321bb71;p=thirdparty%2Fbinutils-gdb.git

	* 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 0faebe81d6a..df58e38c066 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+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-06-13  Nathan Sidwell  <nathan@codesourcery.com>
 
 	gdb/testsuite/
diff --git a/Makefile.def b/Makefile.def
index 3c87dce68dd..183d46eed1b 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -31,7 +31,7 @@ build_modules= { module= flex; };
 build_modules= { module= m4; };
 build_modules= { module= texinfo; };
 build_modules= { module= fixincludes;
-		 extra_configure_args='--target=$(target)'; };
+		 extra_configure_flags='--target=$(target)'; };
 
 host_modules= { module= ash; };
 host_modules= { module= autoconf; };
@@ -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 15a98abc0b2..6dfd9740283 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2581,7 +2581,7 @@ configure-build-fixincludes:
 	libsrcdir="$$s/fixincludes"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} --target=$(target) \
 	  || exit 1
 @endif build-fixincludes
 
@@ -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