diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.def | 2 | ||||
| -rw-r--r-- | Makefile.in | 18 |
3 files changed, 10 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index e7f9cc0740a..5ddd4fd3ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-30 Matthias Klose <doko@ubuntu.com> + + * Makefile.def (target_modules): Don't install libffi. + * Makefile.in: Regenerate. + 2013-02-24 Tilo Schwarz <tilo@tilo-schwarz.de> * MAINTAINERS (Write After Approval): Add myself. diff --git a/Makefile.def b/Makefile.def index 1af7460d242..90d9653d530 100644 --- a/Makefile.def +++ b/Makefile.def @@ -138,7 +138,7 @@ target_modules = { module= libtermcap; no_check=true; missing=maintainer-clean; }; target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; -target_modules = { module= libffi; }; +target_modules = { module= libffi; no_install=true; }; target_modules = { module= libjava; raw_cxx=true; extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; }; target_modules = { module= zlib; }; diff --git a/Makefile.in b/Makefile.in index 08049deb96d..bfbaf03417a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -38710,13 +38710,8 @@ maybe-install-target-libffi: @if target-libffi maybe-install-target-libffi: install-target-libffi -install-target-libffi: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) +# Dummy target for uninstallable. +install-target-libffi: @endif target-libffi @@ -38725,13 +38720,8 @@ maybe-install-strip-target-libffi: @if target-libffi maybe-install-strip-target-libffi: install-strip-target-libffi -install-strip-target-libffi: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) +# Dummy target for uninstallable. +install-strip-target-libffi: @endif target-libffi |