Skip to content

Commit 327af01

Browse files
committed
Also check GNUMakefile for the INST_VER value
Updates #54
1 parent 6117ce5 commit 327af01

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/Perl/Dist/Strawberry/Step/InstallPerlCore.pm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,12 @@ sub run {
5252
}
5353
die "ERROR: cannot detect perl-src dir" unless $perlsrc;
5454

55-
#get verion string - e.g. '5.15.9'
56-
my ($version) = grep { /INST_VER/ } read_file(catfile($unpack_to, $perlsrc, qw/win32 makefile.mk/));
55+
#get version string - e.g. '5.15.9'
56+
my $file_to_check = catfile($unpack_to, $perlsrc, qw/win32 makefile.mk/);
57+
if (!-e $file_to_check) {
58+
$file_to_check = catfile($unpack_to, $perlsrc, qw/win32 GNUMakefile/);
59+
}
60+
my ($version) = grep { /INST_VER/ } read_file($file_to_check);
5761
$version =~ s/^.*?(5\..*?)[\r\n]*$/$1/;
5862

5963
# some handy variables

0 commit comments

Comments
 (0)