add qmake to build systems list

[debhelper.git] / dh

diff --git a/dh b/dh
index 96a6b84af474eb84fa36ebe913fd54c8e9fdf0a4..61ea0aa53369821a35f74eb2ea0312aca21028e7 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,7 @@ subdirectory.
 
        #!/usr/bin/make -f
        %:
-               dh --sourcedirectory=src $@
+               dh $@ --sourcedirectory=src
 
 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
@@ -459,7 +459,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.