From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 11 May 2009 19:00:00 +0000 (-0400)
Subject: Merge branch 'master' into buildsystems
X-Git-Tag: 7.3.0~74
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9803d8bb635132458142416d32273c9c754b2aca;p=debhelper.git

Merge branch 'master' into buildsystems

Conflicts:
	dh_auto_configure
---

9803d8bb635132458142416d32273c9c754b2aca
diff --cc Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 1a01c34,0000000..c62041f
mode 100644,000000..100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@@ -1,52 -1,0 +1,53 @@@
 +# A buildsystem plugin for handling Perl MakeMaker based projects.
 +#
 +# Copyright: © 2008-2009 Joey Hess
 +#            © 2008-2009 Modestas Vainius
 +# License: GPL-2+
 +
 +package Debian::Debhelper::Buildsystem::perl_makemaker;
 +
 +use strict;
 +use Debian::Debhelper::Dh_Lib;
 +use base 'Debian::Debhelper::Buildsystem::makefile';
 +
 +sub DESCRIPTION {
 +	"Perl ExtUtils::MakeMaker (Makefile.PL)"
 +}
 +
 +sub check_auto_buildable {
 +	my $this=shift;
 +	my ($action)=@_;
 +
 +	# Handles configure, install; the rest - next class
 +	if ($action eq "install" || $action eq "configure") {
 +		return -e "Makefile.PL";
 +	}
 +	else {
 +		return 0;
 +	}
 +}
 +
 +sub new {
 +	my $class=shift;
 +	my $this=$class->SUPER::new(@_);
 +	$this->enforce_in_source_building();
 +	return $this;
 +}
 +
 +sub configure {
 +	my $this=shift;
 +	# If set to a true value then MakeMaker's prompt function will
 +	# # always return the default without waiting for user input.
 +	$ENV{PERL_MM_USE_DEFAULT}=1;
 +	doit("perl", "Makefile.PL", "INSTALLDIRS=vendor",
- 		"create_packlist=0", @_);
++		"create_packlist=0", "--skipdeps",
++		@_);
 +}
 +
 +sub install {
 +	my $this=shift;
 +	my $destdir=shift;
 +	$this->SUPER::install($destdir, "PREFIX=/usr", @_);
 +}
 +
 +1;