dh_auto_configure: Revert --skipdeps change Closes: #528647, reopens: #528235

[debhelper.git] / dh_auto_configure

diff --git a/dh_auto_configure b/dh_auto_configure
index fb615f867f16797c0814ca763699d18ddf709562..d69ed162fdefa7ea735ecf3f965f2431aa1049a9 100755 (executable)
--- a/dh_auto_configure
+++ b/dh_auto_configure
@@ -23,7 +23,7 @@ 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 encouraged to skip using dh_auto_configure at all, and just run
-./configure or its equivilant manually.
+./configure or its equivalent manually.
 
 =head1 OPTIONS
 
@@ -31,8 +31,11 @@ you're encouraged to skip using dh_auto_configure at all, and just run
 
 =item B<--> I<params>
 
-Pass "params" to the program that is run. These can be used to suppliment
-or override the standard parameters that dh_auto_configure passes.
+Pass "params" to the program that is run, after the standard
+parameters that dh_auto_configure passes. This can be used to supplement
+or override those parameters. For example:
+
+  dh_auto_configure -- --with-foo --enable-bar
 
 =back
 
@@ -86,12 +89,14 @@ if (-x "configure") {
 }
 elsif (-e "Makefile.PL") {
        # If set to a true value then MakeMaker's prompt function will
-       # # always return the default without waiting for user input.
+       # always return the default without waiting for user input.
        $ENV{PERL_MM_USE_DEFAULT}=1;
-       doit("perl", "Makefile.PL", "INSTALLDIRS=vendor", @{$dh{U_PARAMS}});
+       doit("perl", "Makefile.PL", "INSTALLDIRS=vendor",
+               "create_packlist=0", @{$dh{U_PARAMS}});
 }
 elsif (-e "Build.PL") {
        $ENV{PERL_MM_USE_DEFAULT}=1; # Module::Build can also use this.
+       $ENV{MODULEBUILDRC} = "/dev/null";
        doit("perl", "Build.PL", "installdirs=vendor", @{$dh{U_PARAMS}});
 }