X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_install;h=93986ec9ee8ec1865cdffa81d9cc03fbe914ebfc;hb=452b7e6a61be42b2c345cdeeb00fbe51f88fce32;hp=1483d273874f048f038f9aae6d40b04c267a31ba;hpb=1c190a957c78e22e49c2430c078e82809899c31f;p=debhelper.git

diff --git a/dh_install b/dh_install
index 1483d27..93986ec 100755
--- a/dh_install
+++ b/dh_install
@@ -86,14 +86,9 @@ warned about.
 
 =item B<--sourcedir=dir>
 
-Makes all source files be found under dir. If this is specified, it is
-akin to all the source filenames having "dir/" prepended to them.
-
-To make dh_install behave like the old dh_movefiles, move your
-package.files file to package.install and call dh_install with
-"--sourcedir=debian/tmp" appended to the command. This will
-approximate dh_movefiles behaviour, except it will copy files instead
-of moving them.
+Makes all files to be installed be found under dir. If this is
+specified, it is akin to all the filenames having "dir/" prepended
+to them.
 
 =item B<-Xitem>, B<--exclude=item>
 
@@ -118,7 +113,7 @@ init(options => {
 my @installed;
 
 my $srcdir = '.';
-$srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR};
+$srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR};
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
@@ -152,7 +147,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			my @found = glob "$srcdir/$glob";
 			if (! compat(6)) {
 				# Fall back to looking in debian/tmp.
-				if (! @found || ! -e $found[0]) {
+				if (! @found || ! (-e $found[0] || -l $found[0])) {
 					@found = glob "debian/tmp/$glob";
 				}
 			}
@@ -171,12 +166,9 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			if (! defined $dest) {
 				# Guess at destination directory.
 				$dest=$src;
-				my $strip=$srcdir;
-				if ($strip eq '.') {
-					$strip = "debian/tmp";
-				}
-				$dest=~s/^(.*\/)?\Q$strip\E//;
-				$dest=dirname($dest);
+				$dest=~s/^(.*\/)?\Q$srcdir\E\///;
+				$dest=~s/^(.*\/)?debian\/tmp\///;
+				$dest=dirname("/".$dest);
 				$tmpdest=1;
 			}