use $this rather than $self

[debhelper.git] / Debian / Debhelper / Buildsystem / perl_makemaker.pm

diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 91a0da3d771cdeec8f5d0b34910160899a4b93dd..1d08dd662fa6b616a0dd2a8d4c401aff8e624a87 100644 (file)
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -14,24 +14,12 @@ sub DESCRIPTION {
        "support for building Perl MakeMaker based packages (in-source only)"
 }
 
-sub is_auto_buildable {
-       my ($self, $action)=@_;
+sub check_auto_buildable {
+       my $this=shift;
+       my ($action)=@_;
 
        # Handles configure, install; the rest - next class
-       if ($action eq "install") {
-               # This hack is needed to keep full 100% compatibility with previous
-               # debhelper versions.
-               # XXX JEH perl_makemaker comes before makefile, so
-               # couldn't it instead just test for Makefile.PL?
-               if (-e "Makefile" &&
-                   system('grep -q "generated automatically by MakeMaker" Makefile') == 0) {
-                       return 1;
-               }
-       }
-       # XXX JEH why test for configure here? If building or cleaning, and
-       # a Makefile.PL exists, we know this class can handle those
-       # actions -- it does so by inheriting from the makefile class.
-       elsif ($action eq "configure") {
+       if ($action eq "install" || $action eq "configure") {
                return -e "Makefile.PL";
        }
        else {
@@ -40,14 +28,14 @@ sub is_auto_buildable {
 }
 
 sub new {
-       my $cls=shift;
-       my $self=$cls->SUPER::new(@_);
-       $self->enforce_in_source_building();
-       return $self;
+       my $class=shift;
+       my $this=$class->SUPER::new(@_);
+       $this->enforce_in_source_building();
+       return $this;
 }
 
 sub configure {
-       my $self=shift;
+       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;
@@ -55,17 +43,9 @@ sub configure {
 }
 
 sub install {
-       my $self=shift;
+       my $this=shift;
        my $destdir=shift;
-       # XXX JEH this test seems redundant with the one in
-       # is_auto_buildable, if we get here we know that one succeeded.
-       if (-e "Makefile" &&
-           system('grep -q "generated automatically by MakeMaker" Makefile') == 0) {
-               $self->SUPER::install($destdir, "PREFIX=/usr", @_);
-       }
-       else {
-               $self->SUPER::install($destdir, @_);
-       }
+       $this->SUPER::install($destdir, "PREFIX=/usr", @_);
 }
 
 1;