diff options
author | Robert Coie <rac@gentoo.org> | 2003-09-24 20:28:11 +0000 |
---|---|---|
committer | Robert Coie <rac@gentoo.org> | 2003-09-24 20:28:11 +0000 |
commit | ce08984c085cfc817de2dfe828e5f187c72a8281 (patch) | |
tree | 675cfa382ef769cd36514b5971db594a21726d73 | |
parent | Version bumped. (diff) | |
download | gentoo-2-ce08984c085cfc817de2dfe828e5f187c72a8281.tar.gz gentoo-2-ce08984c085cfc817de2dfe828e5f187c72a8281.tar.bz2 gentoo-2-ce08984c085cfc817de2dfe828e5f187c72a8281.zip |
Attempt to deal with changing DESTDIR and prefix handling in MakeMakers past 6.11
-rw-r--r-- | eclass/perl-module.eclass | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index d1065b1bae82..3b3725b38d1e 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.50 2003/08/22 09:17:52 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.51 2003/09/24 20:28:11 rac Exp $ # # Author: Seemant Kulleen <seemant@gentoo.org> # @@ -22,14 +22,22 @@ SITE_LIB="" ARCH_LIB="" POD_DIR="" +# handling of DESTDIR changed in makemaker 6.11 +MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION gt "6.11" )'` + perl-module_src_prep() { SRC_PREP="yes" if [ "${style}" == "builder" ]; then perl ${S}/Build.PL installdirs=vendor destdir=${D} else - perl Makefile.PL ${myconf} \ - PREFIX=${D}/usr INSTALLDIRS=vendor + if [ "${MMSIXELEVEN}" ]; then + perl Makefile.PL ${myconf} \ + PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D} + else + perl Makefile.PL ${myconf} \ + PREFIX=/usr INSTALLDIRS=vendor + fi fi } @@ -66,29 +74,33 @@ perl-module_src_install() { if [ "${style}" == "builder" ]; then perl ${S}/Build install else - make \ - PREFIX=${D}/usr \ - INSTALLMAN1DIR=${D}/usr/share/man/man1 \ - INSTALLMAN2DIR=${D}/usr/share/man/man2 \ - INSTALLMAN3DIR=${D}/usr/share/man/man3 \ - INSTALLMAN4DIR=${D}/usr/share/man/man4 \ - INSTALLMAN5DIR=${D}/usr/share/man/man5 \ - INSTALLMAN6DIR=${D}/usr/share/man/man6 \ - INSTALLMAN7DIR=${D}/usr/share/man/man7 \ - INSTALLMAN8DIR=${D}/usr/share/man/man8 \ - INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \ - INSTALLSITEMAN2DIR=${D}/usr/share/man/man2 \ - INSTALLSITEMAN3DIR=${D}/usr/share/man/man3 \ - INSTALLSITEMAN4DIR=${D}/usr/share/man/man4 \ - INSTALLSITEMAN5DIR=${D}/usr/share/man/man5 \ - INSTALLSITEMAN6DIR=${D}/usr/share/man/man6 \ - INSTALLSITEMAN7DIR=${D}/usr/share/man/man7 \ - INSTALLSITEMAN8DIR=${D}/usr/share/man/man8 \ - INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3 \ - INSTALLSITEARCH=${D}/${SITE_ARCH} \ - INSTALLSCRIPT=${D}/usr/bin \ - ${myinst} \ - ${mytargets} || die + if [ "${MMSIXELEVEN}" ]; then + make ${myinst} ${mytargets} || die + else + make \ + PREFIX=${D}/usr \ + INSTALLMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLMAN2DIR=${D}/usr/share/man/man2 \ + INSTALLMAN3DIR=${D}/usr/share/man/man3 \ + INSTALLMAN4DIR=${D}/usr/share/man/man4 \ + INSTALLMAN5DIR=${D}/usr/share/man/man5 \ + INSTALLMAN6DIR=${D}/usr/share/man/man6 \ + INSTALLMAN7DIR=${D}/usr/share/man/man7 \ + INSTALLMAN8DIR=${D}/usr/share/man/man8 \ + INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLSITEMAN2DIR=${D}/usr/share/man/man2 \ + INSTALLSITEMAN3DIR=${D}/usr/share/man/man3 \ + INSTALLSITEMAN4DIR=${D}/usr/share/man/man4 \ + INSTALLSITEMAN5DIR=${D}/usr/share/man/man5 \ + INSTALLSITEMAN6DIR=${D}/usr/share/man/man6 \ + INSTALLSITEMAN7DIR=${D}/usr/share/man/man7 \ + INSTALLSITEMAN8DIR=${D}/usr/share/man/man8 \ + INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3 \ + INSTALLSITEARCH=${D}/${SITE_ARCH} \ + INSTALLSCRIPT=${D}/usr/bin \ + ${myinst} \ + ${mytargets} || die + fi fi if [ -f ${D}${ARCH_LIB}/perllocal.pod ]; |