Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_auto_configure

diff --git a/dh_auto_configure b/dh_auto_configure
index 27f9065c9d07ee79886af6d92e66ab06a256c484..fb615f867f16797c0814ca763699d18ddf709562 100755 (executable)
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -16,14 +16,14 @@ B<dh_auto_configure> [S<I<debhelper options>>] [S<B<--> I<params>>]
 =head1 DESCRIPTION
 
 dh_auto_configure is a debhelper program that tries to automatically
-configure a package prior to building. It looks for and runs
-a ./configure script, or Makefile.PL. A standard set of parameters is
-determined and passed to the program that is run. If no program to run
-is found, dh_auto_configure will exit without doing anything.
+configure a package prior to building. It looks for and runs a ./configure
+script, Makefile.PL, or Build.PL. A standard set of parameters is
+determined and passed to the program that is run. If no program to run is
+found, dh_auto_configure will exit without doing anything.
 
 This is intended to work for about 90% of packages. If it doesn't work,
-you're encoruaged to skip using dh_auto_configure at all, and just run
-./configure or its equivilant by hand.
+you're encouraged to skip using dh_auto_configure at all, and just run
+./configure or its equivilant manually.
 
 =head1 OPTIONS
 
@@ -85,10 +85,14 @@ if (-x "configure") {
        doit("./configure", @opts, @{$dh{U_PARAMS}});
 }
 elsif (-e "Makefile.PL") {
-       doit("perl Makefile.PL", "INSTALLDIRS=vendor", @{$dh{U_PARAMS}});
+       # If set to a true value then MakeMaker's prompt function will
+       # # always return the default without waiting for user input.
+       $ENV{PERL_MM_USE_DEFAULT}=1;
+       doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", @{$dh{U_PARAMS}});
 }
-elsif (-e "setup.py") {
-       doit("python setup.py", "build", @{$dh{U_PARAMS}});
+elsif (-e "Build.PL") {
+       $ENV{PERL_MM_USE_DEFAULT}=1; # Module::Build can also use this.
+       doit("perl", "Build.PL", "installdirs=vendor", @{$dh{U_PARAMS}});
 }
 
 =head1 SEE ALSO