Fix build system auto-selection breakage.

[debhelper.git] / dh_auto_install

diff --git a/dh_auto_install b/dh_auto_install
index e05ea2d6914dcf5690beca314d878d05c60fd150..a5d483b11b756150bd608a7848f15375b7466a5e 100755 (executable)
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -8,88 +8,79 @@ dh_auto_install - automatically runs make install or similar
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Buildsystems;
+use File::Spec;
 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.
-
-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)>.
+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. Note that the Ant build system does not support installation,
+so dh_auto_install will not install files built using Ant.
+
+Unless --destdir option is specified, 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)>.
 
 DESTDIR is used to tell make where to install the files. 
 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
 
+See L<debhelper(7)/BUILD SYSTEM OPTIONS> for a list of common build
+system selection and control options.
+
 =over 4
 
+=item B<--destdir=>I<directory>
+
+Install files into the specified I<directory>. If this option is not specified,
+destination directory is determined automatically as described in the
+L</DESCRIPTION> section.
+
 =item B<--> I<params>
 
-Pass "params" to the program that is run. These can be used to suppliment
+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
 
 =cut
 
-init();
-
 my $destdir;
-my @allpackages=getpackages();
-if (@allpackages > 1) {
-       $destdir="debian/tmp";
-}
-else {
-       $destdir=tmpdir($dh{MAINPACKAGE});
-}
-$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") {
-               push @params, "PREFIX=/usr";
+
+buildsystems_init(options => {
+       "destdir=s" => \$destdir,
+});
+
+# If destdir is not specified, determine it automatically
+if (!$destdir) {
+       my @allpackages=getpackages();
+       if (@allpackages > 1) {
+               $destdir="debian/tmp";
        }
-       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;
-               }
+       else {
+               $destdir=tmpdir($dh{MAINPACKAGE});
        }
 }
-elsif (-e "setup.py") {
-       doit("python", "setup.py", "install", 
-               "--root=$destdir",
-               "--no-compile", "-O0",
-               @{$dh{U_PARAMS}});
-}
-elsif (-e "Build.PL" && -e "Build") {
-       doit("perl", "Build", "install", "destdir=$destdir",
-               "create_packlist=0", @{$dh{U_PARAMS}});
-}
+$destdir = File::Spec->rel2abs($destdir, cwd());
+
+buildsystems_do("install", $destdir);
 
 =head1 SEE ALSO