From 895f9cbcfd47a04e241dbae047354d81489ce27f Mon Sep 17 00:00:00 2001 From: joey Date: Mon, 16 Jun 2003 18:10:38 +0000 Subject: [PATCH] r590: * dh_install: recalculate automatic $dest eash time through the glob loop. It might change if there are multiple wildcards Closes: #196344 --- debian/changelog | 7 +++++++ dh_install | 6 ++++++ 2 files changed, 13 insertions(+) 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 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; + } } } } -- 2.39.2