diff options
| author | Daniel Jacobowitz <drow@false.org> | 2006-06-16 00:38:13 +0400 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2006-06-16 00:38:13 +0400 |
| commit | c8faf2d669d2404664e25af2a500f6982a2ec231 (patch) | |
| tree | d857532b3ab7eb65fba0be2d8010d819a6702669 | |
| parent | 6eaea68970ada0c093d4394ad4ae30f1cd27bd80 (diff) | |
* Makefile.def (fixincludes): Correct extra_configure_flags
typo.
(expat): Don't install. Don't build shared libraries.
* Makefile.in: Regenerated.
| -rw-r--r-- | ChangeLog.csl | 7 | ||||
| -rw-r--r-- | Makefile.def | 5 | ||||
| -rw-r--r-- | Makefile.in | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 0faebe81d..df58e38c0 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 3c87dce68..183d46eed 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 15a98abc0..6dfd97402 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 |