dh: Disable option bundling to avoid mis-parsing bundled options such as "-Bpython...

[debhelper.git] / dh

diff --git a/dh b/dh
index b407148b9f5ee6e9dad7ecef376bf11b81915bf6..2b60be5d4ffc701a45bb95ca01fff14f5fbffa2f 100755 (executable)
--- a/dh
+++ b/dh
@@ -35,7 +35,7 @@ in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining>
 options can override this behavior.
 
 If debian/rules contains a target with a name like "override_I<dh_command>",
-then when it would notmally run I<dh_command>, dh will instead call that
+then when it would normally run I<dh_command>, dh will instead call that
 target. The override target can then run the command with additional options,
 or run entirely different commands instead. See examples below. (Note that to
 use this feature, you should Build-Depend on debhelper 7.0.50 or above.)
@@ -175,7 +175,7 @@ default. This is how to use dh_pycentral instead.
 
        #!/usr/bin/make -f
        %:
-               dh --with python-central $@
+               dh $@ --with python-central
 
 Here is how to force use of perl's Module::Build build system,
 which can be necessary if debhelper wrongly detects that the package
@@ -183,14 +183,14 @@ uses MakeMaker.
 
        #!/usr/bin/make -f
        %:
-               dh --buildsystem=perl_build $@
+               dh $@ --buildsystem=perl_build
 
 To patch your package using quilt, you can tell dh to use quilt's dh
 sequence addons like this:
        
        #!/usr/bin/make -f
        %:
-               dh --with quilt $@
+               dh $@ --with quilt
 
 Here is an example of overriding where the dh_auto_* commands find
 the package's source, for a package where the source is located in a
@@ -198,7 +198,14 @@ subdirectory.
 
        #!/usr/bin/make -f
        %:
-               dh --sourcedirectory=src $@
+               dh $@ --sourcedirectory=src
+
+And here is an example of how to tell the dh_auto_* commands to build
+in a subdirectory, which will be removed on clean.
+
+       #!/usr/bin/make -f
+       %:
+               dh $@ --builddirectory=build
 
 Finally, here is a way to prevent dh from running several commands
 that you don't want it to run, by defining empty override targets for each
@@ -220,29 +227,31 @@ my @ARGV_orig=@ARGV;
 # (and comes first so python-central loads later and can disable it).
 unshift @ARGV, "--with=python-support";
                
-# Disable complaints about unknown options for both dh and the commands
-# it runs. This is done because dh accepts and passes on options that may
-# be specific to only some debhelper commands.
-$ENV{DH_IGNORE_UNKNOWN_OPTIONS}=1;
-
 init(options => {
-       "until=s" => \$dh{UNTIL},
-       "after=s" => \$dh{AFTER},
-       "before=s" => \$dh{BEFORE},
-       "remaining" => \$dh{REMAINING},
-       "with=s" => sub {
-               my ($option,$value)=@_;
-               push @{$dh{WITH}},split(",", $value);
-       },
-       "without=s" => sub {
-               my ($option,$value)=@_;
-               @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+               "until=s" => \$dh{UNTIL},
+               "after=s" => \$dh{AFTER},
+               "before=s" => \$dh{BEFORE},
+               "remaining" => \$dh{REMAINING},
+               "with=s" => sub {
+                       my ($option,$value)=@_;
+                       push @{$dh{WITH}},split(",", $value);
+               },
+               "without=s" => sub {
+                       my ($option,$value)=@_;
+                       @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+               },
+               "l" => \$dh{LIST},
+               "list" => \$dh{LIST},
        },
-       "l" => \$dh{LIST},
-       "list" => \$dh{LIST},
-});
+       # Disable complaints about unknown options; they are passed on the
+       # debhelper commands.
+       ignore_unknown_options => 1,
+       # Bundling does not work well since there are unknown options.
+       bundling => 0,
+);
 inhibit_log();
 
+
 # If make is using a jobserver, but it is not available
 # to this process, clean out MAKEFLAGS. This avoids
 # ugly warnings when calling make.
@@ -459,7 +468,17 @@ while (@ARGV_orig) {
        elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without)=)/) {
                next;
        }
-       push @options, $opt;
+       elsif ($opt=~/^-/) {
+               push @options, "-O".$opt;
+       }
+       elsif (@options) {
+               if ($options[$#options]=~/^-O--/) {
+                       $options[$#options].="=".$opt;
+               }
+               else {
+                       $options[$#options].=$opt;
+               }
+       }
 }
 
 # Figure out at what point in the sequence to start for each package.
@@ -561,7 +580,7 @@ sub run {
        }
 
        if (defined $command) {
-               # 3 space indent lines the command being run up under the 
+               # 3 space indent lines the command being run up under the
                # sequence name after "dh ".
                print "   ".escape_shell($command, @options)."\n";
        }
@@ -602,7 +621,7 @@ my $rules_parsed;
 
 sub rules_explicit_target {
        # Checks if a specified target exists as an explicit target
-       # in debian/rules. 
+       # in debian/rules.
        # undef is returned if target does not exist, 0 if target is noop
        # and 1 if target has dependencies or executes commands.
        my $target=shift;
@@ -644,7 +663,8 @@ sub rules_explicit_target {
                                        # here is safe.
                                        $not_a_target = 0;
                                }
-                       } elsif (/^# Files$/) {
+                       }
+                       elsif (/^# Files$/) {
                                $processing_targets = 1;
                        }
                }
@@ -652,7 +672,7 @@ sub rules_explicit_target {
                $rules_parsed = 1;
        }
 
-       return (exists $targets{$target}) ? $targets{$target} : undef;
+       return $targets{$target};
 }
 
 }