X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=dh_installmanpages;h=6d615a16b90a338a9f429424af99d0227c3efe52;hb=503133451f729ed47709e463748cad62bf4d7600;hp=1647d0a5f8230ebb307787945bf4deac0687692d;hpb=71601004ec630641a2efa7e8bc724f525506187a;p=debhelper.git

diff --git a/dh_installmanpages b/dh_installmanpages
index 1647d0a..6d615a1 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -7,7 +7,7 @@
 # This is a little bit (hah!) DWIMish, but still very handy.
 
 use File::Find;
-BEGIN { push @INC, "debian", "/usr/lib/debhelper" }
+BEGIN { push @INC, "debian", "/usr/share/debhelper" }
 use Dh_Lib;
 init();
 
@@ -28,13 +28,13 @@ sub find_man {
 		return;
 	}
 	foreach $dir (@allpackages) {
-		if ($File::Find::dir=~m:debian/$dir:) {
+		if ($File::Find::dir=~m:debian/\Q$dir\E:) {
 			return;
 		}
 	}
 	
 	# And file does think it's a real man page?
-	my $type=`file $_`;
+	my $type=`file -z $_`;
 	if ($type !~ m/:.*roff/) {
 		return;
 	}