Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_auto_install

diff --git a/dh_auto_install b/dh_auto_install
index 2c8c7f6b5ae20e6f9db5f00cf6fe204482c10a65..264725ca80da60ea64c02289a36cc23548c94592 100755 (executable)
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -32,7 +32,7 @@ If the Makefile was generated by MakeMaker from a Makefile.PL, it will
 automatically set PREFIX=/usr too, since such Makefiles need that.
 
 This is intended to work for about 90% of packages. If it doesn't work, or
-tries to use the wrong clean target, you're encouraged to skip using
+tries to use the wrong install target, you're encouraged to skip using
 dh_auto_install at all, and just run make install manually.
 
 =head1 OPTIONS
@@ -41,8 +41,8 @@ dh_auto_install at all, and just run make install manually.
 
 =item B<--> I<params>
 
-Pass "params" to the program that is run. These can be used to suppliment
-or override the any standard parameters that dh_auto_clean passes.
+Pass "params" to the program that is run. These can be used to supplement
+or override the any standard parameters that dh_auto_install passes.
 
 =back
 
@@ -63,10 +63,13 @@ $destdir=cwd()."/".$destdir;
 if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") {
        $ENV{MAKE}="make" unless exists $ENV{MAKE};
        my @params="DESTDIR=$destdir";
-       # Special case for MakeMaker.
-       if (-e "Makefile.PL") {
+
+       # Special case for MakeMaker generated Makefiles.
+       if (-e "Makefile" &&
+           system('grep -q "generated automatically by MakeMaker" Makefile') == 0) {
                push @params, "PREFIX=/usr";
        }
+
        foreach my $target (qw{install}) {
                # Use make -n to check to see if the target would do
                # anything. There's no good way to test if a target exists.
@@ -87,6 +90,7 @@ elsif (-e "setup.py") {
                @{$dh{U_PARAMS}});
 }
 elsif (-e "Build.PL" && -e "Build") {
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build", "install", "destdir=$destdir",
                "create_packlist=0", @{$dh{U_PARAMS}});
 }