summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Buildsystem
diff options
context:
space:
mode:
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r--Debian/Debhelper/Buildsystem/perl_build.pm1
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm7
-rw-r--r--Debian/Debhelper/Buildsystem/python_distutils.pm4
3 files changed, 8 insertions, 4 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_build.pm b/Debian/Debhelper/Buildsystem/perl_build.pm
index 2afa5e5..deb9a37 100644
--- a/Debian/Debhelper/Buildsystem/perl_build.pm
+++ b/Debian/Debhelper/Buildsystem/perl_build.pm
@@ -26,7 +26,6 @@ sub check_auto_buildable {
sub do_perl {
my $this=shift;
- $ENV{MODULEBUILDRC} = "/dev/null";
$this->doit_in_sourcedir("perl", @_);
}
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index b2500ab..72f8d8c 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -7,6 +7,7 @@
package Debian::Debhelper::Buildsystem::perl_makemaker;
use strict;
+use Debian::Debhelper::Dh_Lib qw(compat);
use base 'Debian::Debhelper::Buildsystem::makefile';
sub DESCRIPTION {
@@ -45,8 +46,10 @@ sub configure {
$ENV{PERL_AUTOINSTALL}="--skipdeps";
$this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",
- "create_packlist=0",
- @_);
+ # if perl_build is not tested first, need to pass packlist
+ # option to handle fallthrough case
+ (compat(7) ? "create_packlist=0" : ()),
+ @_);
}
sub install {
diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm
index 70307b0..5115a8a 100644
--- a/Debian/Debhelper/Buildsystem/python_distutils.pm
+++ b/Debian/Debhelper/Buildsystem/python_distutils.pm
@@ -163,7 +163,9 @@ sub setup_py {
sub build {
my $this=shift;
- $this->setup_py("build", @_);
+ $this->setup_py("build",
+ "--force",
+ @_);
}
sub install {