From patchwork Fri Jul  2 14:47:17 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Pass mandir to libffi submakes
Date: Fri, 02 Jul 2010 04:47:17 -0000
From: Jakub Jelinek <jakub@redhat.com>
X-Patchwork-Id: 57667
Message-Id: <20100702144717.GB25077@tyan-ft48-01.lab.bos.redhat.com>
To: Anthony Green <green@redhat.com>, Tom Tromey <tromey@redhat.com>
Cc: gcc-patches@gcc.gnu.org

Hi!

The addition of man pages to libffi from last year causes
make install prefix=/tmp/foo/bar/usr/ mandir=/tmp/foo/bar/usr/share/man/
failures, because mandir is not honored.

Fixed by the following patch, ok for trunk and 4.5?

2010-07-02  Jakub Jelinek  <jakub@redhat.com>

	* Makefile.am (AM_MAKEFLAGS): Pass also mandir to submakes.
	* Makefile.in: Regenerated.



	Jakub


--- libffi/Makefile.am.jj	2010-01-04 10:46:41.000000000 +0100
+++ libffi/Makefile.am	2010-07-02 16:34:55.000000000 +0200
@@ -65,6 +65,7 @@ AM_MAKEFLAGS = \
 	"exec_prefix=$(exec_prefix)" \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
+	"mandir=$(mandir)" \
 	"prefix=$(prefix)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
--- libffi/Makefile.in.jj	2010-04-05 18:49:02.000000000 +0200
+++ libffi/Makefile.in	2010-07-02 16:35:21.000000000 +0200
@@ -444,6 +444,7 @@ AM_MAKEFLAGS = \
 	"exec_prefix=$(exec_prefix)" \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
+	"mandir=$(mandir)" \
 	"prefix=$(prefix)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \