summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2006-06-12 20:11:39 +0000
committerMichael Cummings <mcummings@gentoo.org>2006-06-12 20:11:39 +0000
commit41a60b779958e438d5e4163a3d215b1f4d406418 (patch)
tree5d8e29fc1f6c2c42ba76f1bdebe6777060b2ddb8 /eclass
parentBackported correction of missing quotes. (diff)
downloadgentoo-2-41a60b779958e438d5e4163a3d215b1f4d406418.tar.gz
gentoo-2-41a60b779958e438d5e4163a3d215b1f4d406418.tar.bz2
gentoo-2-41a60b779958e438d5e4163a3d215b1f4d406418.zip
bug 136465
Diffstat (limited to 'eclass')
-rw-r--r--eclass/perl-app.eclass4
-rw-r--r--eclass/perl-module.eclass4
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
index 8ad3f409770b..230d7c088898 100644
--- a/eclass/perl-app.eclass
+++ b/eclass/perl-app.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-app.eclass,v 1.6 2006/06/06 14:08:47 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-app.eclass,v 1.7 2006/06/12 20:11:39 mcummings Exp $
#
# Author: Michael Cummings <mcummings@gentoo.org>
@@ -30,7 +30,7 @@ perl-app_src_prep() {
perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D} || die "Unable to build! (are you using USE=\"build\"?)"
fi
- if [ -f Build.PL ] && [ ! -f Makefile ] ; then
+ if [ -f Build.PL ] && ( [ ! -f Makefile.PL ] || [ ${PN} == "module-build" ]); then
einfo "Using Module::Build"
perl Build.PL --installdirs=vendor --destdir=${D} --libdoc= || die "Unable to build! (are you using USE=\"build\"?)"
fi
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 56e2b4bb2fc7..351356d2d85f 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.95 2006/06/07 21:15:08 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.96 2006/06/12 20:11:39 mcummings Exp $
#
# Author: Seemant Kulleen <seemant@gentoo.org>
# Maintained by the Perl herd <perl@gentoo.org>
@@ -103,7 +103,7 @@ perl-module_src_prep() {
perl Makefile.PL ${myconf} INSTALLMAN3DIR='none'\
PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D} || die "Unable to build! (are you using USE=\"build\"?)"
fi
- if [ -f Build.PL ] && [ ! -f Makefile.PL ] ; then
+ if [ -f Build.PL ] && ( [ ! -f Makefile.PL ] || [ ${PN} == "module-build" ]); then
einfo "Using Module::Build"
perl Build.PL --installdirs=vendor --destdir=${D} --libdoc= || die "Unable to build! (are you using USE=\"build\"?)"
fi