Patchwork [2/2] classes/cpan: fix bin/script/man1/man3 installation dirs

login
register
mail settings
Submitter Roman Khimov
Date Dec. 29, 2010, 10:07 p.m.
Message ID <1293660478-3080-2-git-send-email-khimov@altell.ru>
Download mbox | patch
Permalink /patch/145/
State Accepted
Headers show

Comments

Roman Khimov - Dec. 29, 2010, 10:07 p.m.
Strange that it wasn't done before, but if some perl module wants to install
man pages or some binaries or scripts they all were installed with wrong prefix.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 classes/cpan.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Roman Khimov - Dec. 30, 2010, 7:23 a.m.
? ????????? ?? ??????? 30 ??????? 2010 01:07:58 ????? Roman I Khimov ???????:
> +			-e "s:\(INSTALLVENDORMAN1DIR = \).*:\1${D}${man1dir}:" \
> +			-e "s:\(INSTALLVENDORMAN3DIR = \).*:\1${D}${man1dir}:" \

The latter should be man3dir, obviously.
Frans Meulenbroeks - Dec. 30, 2010, 5:35 p.m.
2010/12/30 Roman I Khimov <roman@khimov.ru>:
> ? ????????? ?? ??????? 30 ??????? 2010 01:07:58 ????? Roman I Khimov ???????:
>> +                     -e "s:\(INSTALLVENDORMAN1DIR = \).*:\1${D}${man1dir}:" \
>> +                     -e "s:\(INSTALLVENDORMAN3DIR = \).*:\1${D}${man1dir}:" \
>
> The latter should be man3dir, obviously.
>
With this patch:

Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

Patch

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index b81ae9a..c21130f 100644
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -13,6 +13,10 @@  cpan_do_configure () {
 			-e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
 			-e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
 			-e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
+			-e "s:\(INSTALLVENDORMAN1DIR = \).*:\1${D}${man1dir}:" \
+			-e "s:\(INSTALLVENDORMAN3DIR = \).*:\1${D}${man1dir}:" \
+			-e "s:\(INSTALLVENDORBIN = \).*:\1${D}${bindir}:" \
+			-e "s:\(INSTALLVENDORSCRIPT = \).*:\1${D}${bindir}:" \
 			-e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
 			Makefile
 	fi