Fix build system auto-selection breakage.

[debhelper.git] / dh_movefiles

diff --git a/dh_movefiles b/dh_movefiles
index 499baf6d2e62a66e8b711c5a97f4c84ea520e619..03957a03ef99a335ef783d8de86bb9cc5dac7d90 100755 (executable)
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [S<I<file ...>>]
+B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [B<-X>I<item>] S<I<file ...>>]
 
 =head1 DESCRIPTION
 
@@ -20,11 +20,20 @@ out of debian/tmp or some other directory and into other package build
 directories. This may be useful if your package has a Makefile that installs
 everything into debian/tmp, and you need to break that up into subpackages.
 
-Files named debian/package.files list the files to be moved, separated by
-whitespace. The filenames listed should be relative to debian/tmp/. You can
-also list directory names, and the whole directory will be moved. If you
-prefer, you can list the files to move on the command line and this will
-apply to the first package dh_movefiles is told to act on.
+Note: dh_install is a much better program, and you are recommended to use
+it instead of dh_movefiles.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.files
+
+Lists the files to be moved into a package, separated by whitespace. The
+filenames listed should be relative to debian/tmp/. You can also list
+directory names, and the whole directory will be moved.
+
+=back
 
 =head1 OPTIONS
 
@@ -34,10 +43,15 @@ apply to the first package dh_movefiles is told to act on.
 
 Instead of moving files out of debian/tmp (the default), this option makes
 it move files out of some other directory. Since the entire contents of
-the sourcedir is moved, specifiying something like --sourcedir=/ is very
+the sourcedir is moved, specifying something like --sourcedir=/ is very
 unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
 it cannot begin with a `/'.
 
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude files that contain "item" anywhere in their filename from
+being installed.
+
 =item I<file ...>
 
 Lists files to move. The filenames listed should be relative to
@@ -59,7 +73,9 @@ deleted by dh_clean later.
 
 =cut
 
-init();
+init(options => {
+       "sourcedir=s" => \$dh{SOURCEDIR},       
+});
 
 my $ret=0;
 
@@ -118,16 +134,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("rm","-f","debian/movelist");
                foreach (@tomove) {
                        my $file=$_;
-                       if (! -e $file && ! -l $file) {
+                       if (! -e $file && ! -l $file && ! $dh{NO_ACT}) {
                                $ret=1;
                                warning("$file not found (supposed to put it in $package)");
                        }
-                       $file=~s:^\Q$sourcedir\E/+::;
-                       complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
+                       else {
+                               $file=~s:^\Q$sourcedir\E/+::;
+                               my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+                               if ($dh{EXCLUDE_FIND}) {
+                                       $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+                               }
+                               $cmd.="-print || true) >> debian/movelist";
+                               complex_doit($cmd);
+                       }
                }
                my $pwd=`pwd`;
                chomp $pwd;
-               complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+               # --remove-files is not used above because tar then doesn't
+               # preserve hard links
+               complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
                doit("rm","-f","debian/movelist");
        }
 }
@@ -143,7 +169,7 @@ exit $ret;
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.