r384: ugh

[debhelper.git] / dh_perl

diff --git a/dh_perl b/dh_perl
index dc614e45877e1307fb9dd07cd2591f746266933a..a3372d5a371621aa5026eef7a328bddd45ab4df2 100755 (executable)
--- a/dh_perl
+++ b/dh_perl
@@ -13,7 +13,9 @@ my $lib_dir = 'usr/lib/perl5';
 # it points to, otherwise query perl directly.
 my $version=sprintf("%.3f", $]);
 if (defined $ENV{PERL}) {
-       $version=`$ENV{PERL} -e 'printf "%.3f", \$]'`;
+       # This is pretty gawd-aweful ugly, because we need "5.00[45]"
+       # and "5.[6789]" to be returned.
+       $version=`$ENV{PERL} -e '\$] < 5.006 ? printf "%.3f", \$] : printf "%vd\n", substr \$^V, 0, -1'`;
 }
 
 # Cleaning the paths given on the command line
@@ -91,14 +93,14 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 
        next unless $dep;
 
-       if (-e "debian/$EXT\substvars") {
-               open (IN, "<debian/$EXT\substvars");
+       if (-e "debian/${EXT}substvars") {
+               open (IN, "<debian/${EXT}substvars");
                my @lines=grep { ! /^perl:Depends=/ } <IN>;
                close IN;
-               open (OUT, ">debian/$EXT\substvars");
+               open (OUT, ">debian/${EXT}substvars");
                print OUT @lines;
        } else {
-               open (OUT, ">debian/$EXT\substvars");
+               open (OUT, ">debian/${EXT}substvars");
        }
        print OUT "perl:Depends=$dep\n";
        close OUT;