Merge branch 'master' into buildsystems

diff --combined dh_auto_install
index 446470270a19bdd55415e3e9219aa597e678a175,8a976a5086eb02dd8b268b8b75b95d919de5a7ed..abf8e107c2c9d156c9da0e07f4189031f7d1ab2c
--- 1/dh_auto_install
--- 2/dh_auto_install
+++ b/dh_auto_install
@@@ -8,27 -8,23 +8,26 @@@ dh_auto_install - automatically runs ma
  
  use strict;
  use Debian::Debhelper::Dh_Lib;
 +use Debian::Debhelper::Dh_Buildsystems;
  use Cwd;
  
  =head1 SYNOPSIS
  
 -B<dh_auto_install> [S<I<debhelper options>>] [S<B<--> I<params>>]
 +B<dh_auto_install> [S<I<build system options>>] [S<I<debhelper options>>] [S<B<--> I<params>>]
  
  =head1 DESCRIPTION
  
  dh_auto_install is a debhelper program that tries to automatically install
 -built files. If there's a Makefile and it contains a "install" target,
 -then this is done by running make (or MAKE, if the environment variable is
 -set). If there is a setup.py or Build.PL, it is used.
 +built files. It does so by running the appropriate command for the build
 +system it detects the package uses. For example, if there's a Makefile and
 +it contains a "install" target, then this is done by running make (or MAKE,
 +if the environment variable is set). If there is a setup.py or Build.PL,
 +it is used.
  
  The files are installed into debian/<package>/ if there is only one binary
  package. In the multiple binary package case, the files are instead
  installed into debian/tmp/, and should be moved from there to the
- appropriate package build directory using L<dh_install(1)> or
- L<dh_movefiles(1)>.
+ appropriate package build directory using L<dh_install(1)>.
  
  DESTDIR is used to tell make where to install the files. 
  If the Makefile was generated by MakeMaker from a Makefile.PL, it will
@@@ -42,9 -38,6 +41,9 @@@ dh_auto_install at all, and just run ma
  
  =over 4
  
 +See L<debhelper(7)/BUILD SYSTEM OPTIONS> for a list of common build
 +system selection and control options.
 +
  =item B<--> I<params>
  
  Pass "params" to the program that is run. These can be used to supplement
@@@ -54,7 -47,7 +53,7 @@@ or override the any standard parameter
  
  =cut
  
 -init();
 +buildsystems_init();
  
  my $destdir;
  my @allpackages=getpackages();
@@@ -66,7 -59,41 +65,7 @@@ else 
  }
  $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 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.
 -              my $ret=`$ENV{MAKE} -s -n $target 2>/dev/null`;
 -              chomp $ret;
 -              if (length $ret) {
 -                      doit($ENV{MAKE}, $target,
 -                              @params,
 -                              @{$dh{U_PARAMS}});
 -                      last;
 -              }
 -      }
 -}
 -elsif (-e "setup.py") {
 -      doit("python", "setup.py", "install", 
 -              "--root=$destdir",
 -              "--no-compile", "-O0",
 -              "--install-layout=deb",
 -              @{$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}});
 -}
 +buildsystems_do("install", $destdir);
  
  =head1 SEE ALSO