2013-04-22 Jan-Benedict Glaw <jbglaw@lug-owl.de>

	* Makefile.def: Sync with GCC.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 0f71f05c2dafb062ef368399b2759bd53d94901c..8f8e1fb5839313c373040e4079cd821af73ef35c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2013-04-22  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+       * Makefile.def: Sync with GCC.
+       * Makefile.in: Regenerate.
+
 2013-04-22  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
        * configure.ac: Sync with GCC.
-       * configure: Regenerated.
+       * configure: Regenerate.
 
 2013-03-22  Mike Frysinger  <vapier@gentoo.org>
 

diff --git a/Makefile.def b/Makefile.def
index 1af7460d242c0b067dc32ce249d53ad8b2b7b985..90d9653d53047193721ac66db7421592a4a629f5 100644 (file)
--- 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 08049deb96d0c1ac13cc73783c5be49bdf9d6167..bfbaf03417a47520f866df0040be4ee41663285a 100644 (file)
--- 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