summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2003-06-16 18:10:38 +0000
committerjoey <joey>2003-06-16 18:10:38 +0000
commit895f9cbcfd47a04e241dbae047354d81489ce27f (patch)
tree0fd6446b156a014b980e4901a32ff01d9cc93848
parentc6737cf60bbb2079a8e6b3de48b1e518597dafb1 (diff)
r590: * dh_install: recalculate automatic $dest eash time through the glob loop.
It might change if there are multiple wildcards Closes: #196344
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_install6
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 20fd27b..b7913c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.1.47) unstable; urgency=low
+
+ * dh_install: recalculate automatic $dest eash time through the glob loop.
+ It might change if there are multiple wildcards Closes: #196344
+
+ -- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2003 13:35:27 -0400
+
debhelper (4.1.46) unstable; urgency=low
* Added dh_scrollkeeper, by Ross Burton.
diff --git a/dh_install b/dh_install
index c37b9d3..5dff462 100755
--- a/dh_install
+++ b/dh_install
@@ -127,6 +127,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
foreach my $set (@install) {
my $dest;
+ my $tmpdest=0;
if (! defined $dh{AUTODEST} && @$set > 1) {
$dest=pop @$set;
@@ -144,6 +145,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
$dest=~s/^(.*\/)?\Q$strip\E//;
$dest=dirname($dest);
+ $tmpdest=1;
}
# Make sure the destination directory exists.
@@ -174,6 +176,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
else {
doit("cp", "-a", $src, "$tmp/$dest/");
}
+
+ if ($tmpdest) {
+ $dest=undef;
+ }
}
}
}