From: Richard Guenther <rguenther@suse.de>
Date: Wed, 20 Jun 2012 13:16:35 +0000 (+0000)
Subject: backport: re PR libffi/52223 (libffi's man page install breaks with multilibs and... 
X-Git-Tag: releases/gcc-4.5.4~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b03dee36732d5f3a630b2012597cda99ea4d84d;p=thirdparty%2Fgcc.git

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

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 f5efb6964727..2ea79ce59eb2 100644
--- 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 ccbefe64da6a..23e002e96454 100644
--- 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 3ac6d29b877f..74ee53701318 100644
--- 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