From c53c815a58c1874bc09c37327154ce0fd061d9b5 Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Wed, 17 Apr 2002 01:32:54 +0000
Subject: r520:    * dh_install: delay globbing until after destintations have
 been found.      Closes: #143234

---
 dh_install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dh_install')

diff --git a/dh_install b/dh_install
index b3dab4c1..019d0f1b 100755
--- a/dh_install
+++ b/dh_install
@@ -30,7 +30,7 @@ the line tells the directory it should be installed in. The name of the
 files (or directories) to install should be given relative to the current
 directory, while the installation directory is given relative to the
 package build directory. You may use wildcards in the names of the files to
-install.
+install (in v3 mode and above).
 
 This program may be used in one of two ways. If you just have a file or two
 that the upstream Makefile does not install for you, you can run dh_install
@@ -84,7 +84,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	my @install;
 	if ($file) {
-		@install=filedoublearray($file, ".");
+		@install=filedoublearray($file); # no globbing yet
 	}
 	
 	if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
@@ -104,7 +104,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$dest=pop @$set;
 		}
 		
-		foreach my $src (@$set) {
+		foreach my $src (map { glob } @$set) { # glob now
 			next if excludefile($src);
 		
 			if (! defined $dest) {
-- 
cgit v1.2.3