X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_auto_install;h=2e2aa2143659823038b7db397a7cb69b21f26cfb;hb=8890fd28cdca58fc15306e34d022f312a2708ca6;hp=b35810a338d5cd39d536f15fdcea0a7dbb308f33;hpb=f2fd63ed1124d54f398e5bc3a0cdbd383a21c196;p=debhelper.git

diff --git a/dh_auto_install b/dh_auto_install
index b35810a..2e2aa21 100755
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -8,50 +8,56 @@ dh_auto_install - automatically runs make install or similar
 
 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, 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 to act on. 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)>.
+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 encoruaged 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<--> 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
 
 =cut
 
-init();
+buildsystems_init();
 
 my $destdir;
-if (@{$dh{DOPACKAGES}} > 1) {
+my @allpackages=getpackages();
+if (@allpackages > 1) {
 	$destdir="debian/tmp";
 }
 else {
@@ -59,35 +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.
-	if (-e "Makefile.PL") {
-		push @params, "PREFIX=/usr";
-	}
-	foreach my $target (qw{install}) {
-		# Make --question returns false if the target is
-		# up-to-date. But we still want to run the target in this
-		# case. So check if a target exists by seeing if make outputs
-		# "Making target".
-		my $ret=`LANG=C $ENV{MAKE} --question $target 2>/dev/null`;
-		chomp $ret;
-		if ($ret =~ /^Making \Q$target\E/m) {
-			doit($ENV{MAKE}, $target,
-				@params,
-				@{$dh{U_PARAMS}});
-			last;
-		}
-	}
-}
-elsif (-e "setup.py") {
-	doit("python setup.py", "install", 
-		"--root=$destdir",
-		"--no-compile", "-O0",
-		@{$dh{U_PARAMS}});
-}
-
+buildsystems_do("install", $destdir);
 
 =head1 SEE ALSO