Patchwork Pass mandir to libffi submakes

login
register
mail settings
Submitter Jakub Jelinek
Date July 2, 2010, 2:47 p.m.
Message ID <20100702144717.GB25077@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/57667/
State New
Headers show

Comments

Jakub Jelinek - July 2, 2010, 2:47 p.m.
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
Anthony Green - July 2, 2010, 3:08 p.m.
Jakub Jelinek <jakub@redhat.com> writes:

> 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.

Thanks Jakub.

AG


>
> 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.
>
> --- 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)" \
>
>
> 	Jakub

Patch

--- 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)" \