diff options
| author | Mikael Pettersson <mikpe@it.uu.se> | 2012-02-27 11:00:12 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-02-27 11:00:12 +0100 |
| commit | 2c2a780f7f5a7ba054cf1ba5b1998b031c1d9535 (patch) | |
| tree | 5d572400400db9e979399fbbbbe613365ba55b8f /libffi | |
| parent | dac73555da5be0950385efad9692019790b4cf81 (diff) | |
| download | gcc-2c2a780f7f5a7ba054cf1ba5b1998b031c1d9535.tar.gz | |
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
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 6 | ||||
| -rw-r--r-- | libffi/Makefile.am | 3 | ||||
| -rw-r--r-- | libffi/Makefile.in | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index cfb7a2ff4ba..76fb1d4fbf0 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2012-02-27 Mikael Pettersson <mikpe@it.uu.se> + + PR libffi/52223 + * Makefile.am (FLAGS_TO_PASS): Define. + * Makefile.in: Regenerate. + 2012-02-23 Kai Tietz <ktietz@redhat.com> PR libffi/52221 diff --git a/libffi/Makefile.am b/libffi/Makefile.am index ccbefe64da6..23e002e9645 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 3ac6d29b877..74ee5370131 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 |