backport: re PR libffi/52223 (libffi's man page install breaks with multilibs and...

2012-06-20  Richard Guenther  <rguenther@suse.de>

	Backport from mainline
	2012-02-27  Mikael Pettersson  <mikpe@it.uu.se>

	PR libffi/52223
	* Makefile.am (FLAGS_TO_PASS): Define.
	* Makefile.in: Regenerate.

From-SVN: r188830

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index f5efb696472706295c9d3099444fc842a526b63a..2ea79ce59eb227a0637cb7fd90f0b4eff817e33c 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-20  Richard Guenther  <rguenther@suse.de>
+
+       Backport from mainline
+       2012-02-27  Mikael Pettersson  <mikpe@it.uu.se>
+
+       PR libffi/52223
+       * Makefile.am (FLAGS_TO_PASS): Define.
+       * Makefile.in: Regenerate.
+
 2011-05-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        Backport from mainline:

diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index ccbefe64da6a68876a5c9580a906d60660afcd8e..23e002e96454a561b05406dc52b8dcb7eed29378 100644 (file)
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -76,6 +76,9 @@ AM_MAKEFLAGS = \
        "RANLIB=$(RANLIB)" \
        "DESTDIR=$(DESTDIR)"
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 MAKEOVERRIDES=
 
 toolexeclib_LTLIBRARIES = libffi.la

diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 3ac6d29b877f87ab5a0e3093b6f372c3ef97afdc..74ee537013180f30e61c010597dfd41d0dcddaa1 100644 (file)
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -455,6 +455,9 @@ AM_MAKEFLAGS = \
        "RANLIB=$(RANLIB)" \
        "DESTDIR=$(DESTDIR)"
 
+
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 MAKEOVERRIDES = 
 toolexeclib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la