summaryrefslogtreecommitdiff
path: root/dh_movefiles
diff options
context:
space:
mode:
authorjoey <joey>2000-11-28 04:27:52 +0000
committerjoey <joey>2000-11-28 04:27:52 +0000
commitc577623cfbfa6aedbe12da4b96759864ae6f466d (patch)
treeb6edbaa66307d4e083d7ccbfbb31253cdd7a4a4a /dh_movefiles
parent6fc1257675d5451fed096c168ca1e605404d3cd5 (diff)
r397: horribly broke everything I touched :-)
Diffstat (limited to 'dh_movefiles')
-rwxr-xr-xdh_movefiles21
1 files changed, 12 insertions, 9 deletions
diff --git a/dh_movefiles b/dh_movefiles
index f2ea123..1ee71e7 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -29,7 +29,7 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
# debian/files has a different purpose, so ignore it.
if ( $files && $files ne "debian/files" ) {
- @tomove=filearray($files);
+ @tomove=filearray($files, $sourcedir);
}
if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
@@ -40,24 +40,27 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMAPT=2?");
}
- if (@tomove) {
- if (! -d $TMP) {
- doit("install","-d",$TMP);
- }
- # Now we need to expand wildcards in @tomove.
+ # Now we need to expand wildcards in @tomove.
+ # This is only necessary in pre-v3 land, as of v3, the
+ # expension is automatically done by filearray().
+ if (@tomove && ! Debian::Debhelper::Dh_Lib::compat(3)) {
@filelist=();
foreach (@tomove) {
push @filelist, glob("$sourcedir/$_");
}
+ @tomove=@filelist;
+ }
- # If the globs expended to nothing, we are done.
- next unless @filelist;
+ if (@tomove) {
+ if (! -d $TMP) {
+ doit("install","-d",$TMP);
+ }
# Order the files. First all real files, then symlinks.
# Putting symlinks last is a nice thing to do for library
# packages and doesn't affect much of anything else.
doit("rm","-f","debian/movelist");
- foreach (@filelist) {
+ foreach (@tomove) {
$file=$_;
$ret=1 if (! -e $file && ! -l $file);
$file=~s:^\Q$sourcedir\E/+::;