Merge branch 'master' into buildsystems

[debhelper.git] / dh

diff --git a/dh b/dh
index d1885101e6d4db90feac52c39adebc4137305baf..bcd5b02dae530fbf3055cbacab5b013c84fb0a7d 100755 (executable)
--- a/dh
+++ b/dh
@@ -179,6 +179,16 @@ sequence addons like this:
        %:
                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
+subdirectory. It also forces use of perl's Module::Build build system,
+which can be necessary if debhelper wrongly detects that the package
+uses MakeMaker.
+
+       #!/usr/bin/make -f
+       %:
+               dh --sourcedirectory=src --buildsystem=perl_build $@
+
 =cut
 
 # Stash this away before init modifies it.
@@ -252,7 +262,6 @@ $sequences{install} = [@{$sequences{build}}, qw{
        dh_gconf
        dh_icons
        dh_perl
-       dh_scrollkeeper
        dh_usrlocal
 
        dh_link