Merge branch 'dh_overrides'

[debhelper.git] / dh

diff --git a/dh b/dh
index b4690ef7e3bb1832677ef0e6db12908ae10965e7..7cba15610e39fd806187c0934cbe34b3d04bce9d 100755 (executable)
--- a/dh
+++ b/dh
@@ -39,7 +39,7 @@ then when it gets to that command in the sequence, dh will run that
 target from the rules file, rather than running the actual command. The
 override target can then run the command with additional options, or run
 entirely different commands instead. (Note that to use this feature,
-you should Build-Depend on debhelper 7.2 or above.)
+you should Build-Depend on debhelper 7.0.50 or above.)
 
 =head1 OPTIONS
 
@@ -140,14 +140,14 @@ anything:
 This is a very simple rules file, for packages where the default sequences of
 commands work with no additional options.
 
-       #!/usr/bin/make -Bf
+       #!/usr/bin/make -f
        %:
                dh $@
 
 Often you'll want to pass an option to a specific debhelper command. The
 easy way to do with is by adding an override target for that command.
        
-       #!/usr/bin/make -Bf
+       #!/usr/bin/make -f
        %:
                dh $@
 
@@ -161,7 +161,7 @@ Sometimes the automated dh_auto_configure and dh_auto_build can't guess
 what to do for a strange package. Here's how to avoid running either
 and instead run your own commands.
 
-       #!/usr/bin/make -Bf
+       #!/usr/bin/make -f
        %:
                dh $@
 
@@ -174,7 +174,7 @@ and instead run your own commands.
 Another common case is wanting to do something manually before or
 after a particular debhelper command is run.
 
-       #!/usr/bin/make -Bf
+       #!/usr/bin/make -f
        %:
                dh $@
 
@@ -185,9 +185,9 @@ after a particular debhelper command is run.
 If your package is a python package, dh will use dh_pysupport by
 default. This is how to use dh_pycentral instead.
 
-       #!/usr/bin/make -Bf
+       #!/usr/bin/make -f
        %:
-               dh --with python-central
+               dh --with python-central $@
 
 =cut
 
@@ -385,7 +385,7 @@ foreach my $package (@packages) {
                # no commands remain to run after it, communicating to
                # future dh instances that the specified command should not
                # be run again.
-               writelog($package, $sequence[$startpoint{$package}-1]);
+               writelog($sequence[$startpoint{$package}-1], $package);
        }
        elsif ($dh{REMAINING}) {
                # Start at the beginning so all remaining commands will get
@@ -479,7 +479,7 @@ sub run {
                        # been run by the rules file target.
                        my %packages=map { $_ => 1 } @packages;
                        map { delete $packages{$_} } @exclude;
-                       Debian::Debhelper::Dh_Lib::write_log($override_command, keys %packages);
+                       writelog($override_command, keys %packages);
                }
        }
 }
@@ -498,15 +498,9 @@ sub loadlog {
        close LOG;
        return @log;
 }
-               
+
 sub writelog {
-       my $package=shift;
-       my $cmd=shift;
-       my $ext=pkgext($package);
-       
-       open(LOG, ">>", "debian/${ext}debhelper.log") || error("failed to write to log");
-       print LOG $cmd."\n";
-       close LOG;
+       Debian::Debhelper::Dh_Lib::write_log(@_);
 }
 
 {
@@ -521,7 +515,7 @@ sub rules_explicit_target {
        if (! $rules_parsed) {  
                my $processing_targets = 0;
                my $not_a_target = 0;
-               open(MAKE, "make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+               open(MAKE, "LANG=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
                while (<MAKE>) {
                        if ($processing_targets) {
                                if (/^# Not a target:/) {