X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_perl;h=fbeee2d9525faf29c0ac9c9688906161f3c571f1;hb=refs%2Ftags%2F7.0.7;hp=34624d3f38ad3ebd1103fd5dfdb76aee81e03b88;hpb=3aa6fbb20465d16cf23e1607b078ed3cedf95ebe;p=debhelper.git

diff --git a/dh_perl b/dh_perl
index 34624d3..fbeee2d 100755
--- a/dh_perl
+++ b/dh_perl
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_perl - calculates perl dependencies
+dh_perl - calculates perl dependencies and cleans up after MakeMaker
 
 =cut
 
@@ -25,6 +25,9 @@ and will use this information to generate a dependency on perl or
 perlapi. The dependency will be substituted into your package's control
 file wherever you place the token "${perl:Depends}".
 
+dh_perl also cleans up empty directories that MakeMaker can generate when
+installing perl modules.
+
 =head1 OPTIONS
 
 =over 4
@@ -36,6 +39,10 @@ full perl package. If so, you can pass the -d option to make dh_perl generate
 a dependency on the correct base package. This is only necessary for some
 packages that are included in the base system.
 
+Note that this flag may cause no dependency on perl-base to be generated at
+all. perl-base is Essential, so its dependency can be left out, unless a
+versioned dependency is needed.
+
 =item B<-V>
 
 By default, scripts and architecture independent modules don't depend
@@ -85,8 +92,7 @@ use constant PM_MODULE => 2;
 use constant XS_MODULE => 4;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-	my $tmp = tmpdir($package);
-	my $ext = pkgext($package);
+	my $tmp=tmpdir($package);
 
 	delsubstvar($package, "perl:Depends"); # for idempotency
 	
@@ -132,6 +138,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		addsubstvar($package, "perl:Depends", "perlapi-$Config{version}")
 			if $deps & XS_MODULE;
 	}
+
+	# MakeMaker always makes lib and share dirs, but typically
+	# only one directory is installed into.
+	foreach my $dir ("$tmp/usr/share/perl5", "$tmp/usr/lib/perl5") {
+		if (-d $dir) {
+			doit("rmdir", "--ignore-fail-on-non-empty", "--parents",
+				"$dir");
+		}
+	}
 }
 
 =head1 SEE ALSO