Fix build system auto-selection breakage.

[debhelper.git] / dh_auto_install

diff --git a/dh_auto_install b/dh_auto_install
index abf8e107c2c9d156c9da0e07f4189031f7d1ab2c..a5d483b11b756150bd608a7848f15375b7466a5e 100755 (executable)
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -9,6 +9,7 @@ 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
@@ -22,12 +23,14 @@ 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.
+it is used. Note that the Ant build system does not support installation,
+so dh_auto_install will not install files built using Ant.
 
-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)>.
+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
@@ -39,11 +42,17 @@ dh_auto_install at all, and just run make install manually.
 
 =head1 OPTIONS
 
-=over 4
-
 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 supplement
@@ -53,17 +62,23 @@ or override the any standard parameters that dh_auto_install passes.
 
 =cut
 
-buildsystems_init();
-
 my $destdir;
-my @allpackages=getpackages();
-if (@allpackages > 1) {
-       $destdir="debian/tmp";
-}
-else {
-       $destdir=tmpdir($dh{MAINPACKAGE});
+
+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";
+       }
+       else {
+               $destdir=tmpdir($dh{MAINPACKAGE});
+       }
 }
-$destdir=cwd()."/".$destdir;
+$destdir = File::Spec->rel2abs($destdir, cwd());
 
 buildsystems_do("install", $destdir);