From 2c2a780f7f5a7ba054cf1ba5b1998b031c1d9535 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Mon, 27 Feb 2012 11:00:12 +0100 Subject: re PR libffi/52223 (libffi's man page install breaks with multilibs and overridden mandir) PR libffi/52223 * Makefile.am (FLAGS_TO_PASS): Define. * Makefile.in: Regenerate. From-SVN: r184592 --- libffi/ChangeLog | 6 ++++++ libffi/Makefile.am | 3 +++ libffi/Makefile.in | 3 +++ 3 files changed, 12 insertions(+) (limited to 'libffi') diff --git a/libffi/ChangeLog b/libffi/ChangeLog index cfb7a2f..76fb1d4 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2012-02-27 Mikael Pettersson + + PR libffi/52223 + * Makefile.am (FLAGS_TO_PASS): Define. + * Makefile.in: Regenerate. + 2012-02-23 Kai Tietz PR libffi/52221 diff --git a/libffi/Makefile.am b/libffi/Makefile.am index ccbefe6..23e002e 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 3ac6d29..74ee537 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 -- cgit v1.1