Fix build system auto-selection breakage.

[debhelper.git] / dh_builddeb

diff --git a/dh_builddeb b/dh_builddeb
index adad09dd9886a190c6ada6712e25d24a3f8df0cf..3477f25765d2693107ab74d87bf4b9a79bf04e6e 100755 (executable)
--- a/dh_builddeb
+++ b/dh_builddeb
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_builddeb - build debian packages
+dh_builddeb - build debian binary packages
 
 =cut
 
@@ -11,12 +11,11 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_builddeb [debhelper options] [--destdir=directory] 
-              [--name=filename] [-uparams] [-- params]
+B<dh_builddeb> [S<I<debhelper options>>] [B<--destdir=>I<directory>] [B<--filename=>I<name>] [S<B<--> I<params>>]
 
 =head1 DESCRIPTION
 
-dh_builddeb simply calls L<dpkg(8)> to build a debian package or
+dh_builddeb simply calls L<dpkg-deb(1)> to build a debian package or
 packages.
 
 =head1 OPTIONS
@@ -28,22 +27,29 @@ packages.
 Use this if you want the generated .deb files to be put in a directory
 other than the default of ".."
 
-=item B<--name=>I<filename>
+=item B<--filename=>I<name>
 
 Use this if you want to force the generated .deb file to have a particular
 file name. Does not work well if more than one .deb is generated!
 
-=item B<-u>I<params>
 =item B<--> I<params>
 
-Pass I<params> to L<dpkg(1)|dpkg> when it is used to build the
+Pass I<params> to L<dpkg-deb(1)> when it is used to build the
 package.
 
+=item B<-u>I<params>
+
+This is another way to pass I<params> to L<dpkg-deb(1)>.
+It is deprecated; use B<--> instead.
+
 =back
 
 =cut
 
-init();
+init(options => {
+       "filename=s" => \$dh{FILENAME},
+       "destdir=s" => \$dh{DESTDIR},
+});
 
 # Set the default destination directory.
 if (! defined $dh{DESTDIR}) {
@@ -59,12 +65,32 @@ else {
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
-       doit("dpkg","--build",$tmp,"$dh{DESTDIR}$dh{FILENAME}",@{$dh{U_PARAMS}});
+       if (exists $ENV{DH_ALWAYS_EXCLUDE} && length $ENV{DH_ALWAYS_EXCLUDE}) {
+               if (! compat(5)) {
+                       complex_doit("find $tmp $dh{EXCLUDE_FIND} | xargs rm -rf");
+               }
+               else {
+                       # Old broken code here for compatibility. Does not
+                       # remove everything.
+                       complex_doit("find $tmp -name $_ | xargs rm -rf")
+                               foreach split(":", $ENV{DH_ALWAYS_EXCLUDE});
+               }
+       }
+       if (! is_udeb($package)) {
+               doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$dh{FILENAME});
+       }
+       else {
+               my $filename=$dh{FILENAME};
+               if (! $filename) {
+                       $filename="/".udeb_filename($package);
+               }
+               doit("dpkg-deb", @{$dh{U_PARAMS}}, "--build", $tmp, $dh{DESTDIR}.$filename);
+       }
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.