perl 5.8.8/cpan: Fix the installation paths for cpan modules. The installed

files for perl modules built using cpan will end up in different places
depending on which version of perl they are being built with. Modules that
explicitly set various FILES_ values were using the paths that are only
valid for the older versions of perl. Calculate and set the correct path in
cpan.bbclass and use that in the FILES_ variables so that it'll be correct
for all versions of perl.

8 files changed, 42 insertions, 42 deletions

diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb
index 8631e1da02..19f60f801b 100644
--- a/packages/perl/libcompress-zlib-perl_1.42.bb
+++ b/packages/perl/libcompress-zlib-perl_1.42.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Compress::Zlib - Interface to zlib compression library"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz"
 
@@ -9,7 +9,7 @@ S = "${WORKDIR}/Compress-Zlib-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Compress/Zlib/* \
-                ${libdir}/perl5/*/*/auto/Compress/Zlib/.packlist \
-                ${libdir}/perl5/*/*/Compress"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Compress/Zlib/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/Compress/Zlib/* \
+                ${PERLLIBDIRS}/auto/Compress/Zlib/.packlist \
+                ${PERLLIBDIRS}/Compress"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Compress/Zlib/.debug"
diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb
index 5e482164bb..178b463d38 100644
--- a/packages/perl/libdigest-sha1-perl_2.11.bb
+++ b/packages/perl/libdigest-sha1-perl_2.11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz"
 
@@ -9,7 +9,7 @@ S = "${WORKDIR}/Digest-SHA1-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Digest/SHA1/* \
-                ${libdir}/perl5/*/*/auto/Digest/SHA1/.packlist \
-                ${libdir}/perl5/*/*/Digest"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Digest/SHA1/.debug"
+FILES_${PN} += "${PERLLIBDIRS}/auto/Digest/SHA1/* \
+                ${PERLLIBDIRS}/auto/Digest/SHA1/.packlist \
+                ${PERLLIBDIRS}/Digest"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Digest/SHA1/.debug"
diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb
index cd7c19fb2a..acb280b111 100644
--- a/packages/perl/libipc-sharelite-perl_0.09.bb
+++ b/packages/perl/libipc-sharelite-perl_0.09.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz"
 
@@ -9,7 +9,7 @@ S = "${WORKDIR}/IPC-ShareLite-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/IPC/ShareLite/* \
-                ${libdir}/perl5/*/*/auto/IPC/ShareLite/.packlist \
-                ${libdir}/perl5/*/*/IPC"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/IPC/ShareLite/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/IPC/ShareLite/* \
+                ${PERLLIBDIRS}/auto/IPC/ShareLite/.packlist \
+                ${PERLLIBDIRS}/IPC"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/IPC/ShareLite/.debug"
diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb
index b4fe0b2f2c..177ad02e85 100644
--- a/packages/perl/liblocale-gettext-perl_1.05.bb
+++ b/packages/perl/liblocale-gettext-perl_1.05.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Locale::gettext - message handling functions"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS = "virtual/libintl"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz"
 
@@ -10,7 +10,7 @@ S = "${WORKDIR}/gettext-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Locale/gettext/* \
-                ${libdir}/perl5/*/*/auto/Locale/gettext/.packlist \
-                ${libdir}/perl5/*/*/Locale"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Locale/gettext/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/Locale/gettext/* \
+                ${PERLLIBDIRS}/auto/Locale/gettext/.packlist \
+                ${PERLLIBDIRS}/Locale"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Locale/gettext/.debug"
diff --git a/packages/perl/libmath-bigint-gmp-perl_1.18.bb b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
index d850ab71f1..53a83da08b 100644
--- a/packages/perl/libmath-bigint-gmp-perl_1.18.bb
+++ b/packages/perl/libmath-bigint-gmp-perl_1.18.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 DEPENDS += "gmp-native"
 RDEPENDS += "gmp"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TE/TELS/math/Math-BigInt-GMP-${PV}.tar.gz"
 
@@ -11,7 +11,7 @@ S = "${WORKDIR}/Math-BigInt-GMP-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Math/BigInt/GMP/* \
-                ${libdir}/perl5/*/*/auto/Math/BigInt/GMP/.packlist \
-                ${libdir}/perl5/*/*/Math"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Math/BigInt/GMP/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/Math/BigInt/GMP/* \
+                ${PERLLIBDIRS}/auto/Math/BigInt/GMP/.packlist \
+                ${PERLLIBDIRS}/Math"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Math/BigInt/GMP/.debug"
diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb
index 8b1f9583ed..c102b6df1b 100644
--- a/packages/perl/libparams-validate-perl_0.86.bb
+++ b/packages/perl/libparams-validate-perl_0.86.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Params::Validate - Validate method/function parameters"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz"
 
@@ -9,8 +9,8 @@ S = "${WORKDIR}/Params-Validate-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/Params/Validate/* \
-                ${libdir}/perl5/*/*/auto/Params/Validate/.packlist \
-                ${libdir}/perl5/*/*/Params \
-                ${libdir}/perl5/*/*/Attribute"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/Params/Validate/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/Params/Validate/* \
+                ${PERLLIBDIRS}/auto/Params/Validate/.packlist \
+                ${PERLLIBDIRS}/Params \
+                ${PERLLIBDIRS}/Attribute"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/Params/Validate/.debug"
diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb
index b78397e9e6..b4f398f040 100644
--- a/packages/perl/libversion-perl_0.6701.bb
+++ b/packages/perl/libversion-perl_0.6701.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "version - Perl extension for Version Objects"
 SECTION = "libs"
 LICENSE = "Artistic|GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz"
 
@@ -9,8 +9,8 @@ S = "${WORKDIR}/version-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/version/vxs/* \
-                ${libdir}/perl5/*/*/auto/version/.packlist \
-                ${libdir}/perl5/*/*/version/* \
-                ${libdir}/perl5/*/*/version.pm"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/version/vxs/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/version/vxs/* \
+                ${PERLLIBDIRS}/auto/version/.packlist \
+                ${PERLLIBDIRS}/version/* \
+                ${PERLLIBDIRS}/version.pm"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/version/vxs/.debug"
diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb
index 25fec1e093..f6cbb4efbe 100644
--- a/packages/perl/libxml-parser-perl_2.34.bb
+++ b/packages/perl/libxml-parser-perl_2.34.bb
@@ -1,6 +1,6 @@
 SECTION = "libs"
 LICENSE = "Artistic"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
 
@@ -8,7 +8,7 @@ S = "${WORKDIR}/XML-Parser-${PV}"
 
 inherit cpan
 
-FILES_${PN} = "${libdir}/perl5/*/*/auto/XML/Parser/Expat/* \
-                ${libdir}/perl5/*/*/auto/XML/Parser/.packlist \
-                ${libdir}/perl5/*/*/XML"
-FILES_${PN}-dbg += "${libdir}/perl5/*/*/auto/XML/Parser/Expat/.debug"
+FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \
+                ${PERLLIBDIRS}/auto/XML/Parser/.packlist \
+                ${PERLLIBDIRS}/XML"
+FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/XML/Parser/Expat/.debug"