In makedef.pl, use %Config to avoid hardcoding the DLL version number.

diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version
index 5b6e1995909a6a8a46f88e3f18940c4879788950..a0b83110f3ec2f8e6288983b06a0393e5f7daaa8 100644 (file)
--- a/Porting/bump-perl-version
+++ b/Porting/bump-perl-version
@@ -183,7 +183,7 @@ my @maps =  (
        qr{\b ((?:lib)?) perl (\d\d\d) (s?) \b }x,
        sub {$2, "$1perl$newx$newy$3" },
        "$oldx$oldy",
-       qr/makedef|win32|hints/,      # makedef.pl, README.win32, win32/*, hints/*
+       qr/win32|hints/,      # README.win32, win32/*, hints/*
     ],
 
     # microperl locations should be bumped for major versions

diff --git a/makedef.pl b/makedef.pl
index 5841d69f1913e1c03198ffc7c3566760254b561e..a4b5ced556ef0e1c3bbe23e4b05bf4c642d28ee5 100644 (file)
--- a/makedef.pl
+++ b/makedef.pl
@@ -1281,7 +1281,8 @@ if ($ARGS{PLATFORM} eq 'os2') {
 # Start with platform specific headers:
 
 if ($ARGS{PLATFORM} =~ /^win(?:32|ce)$/) {
-    (my $dll = ($define{PERL_DLL} || "perl515")) =~ s/\.dll$//i;
+    my $dll = $define{PERL_DLL} ? $define{PERL_DLL} =~ s/\.dll$//ir
+       : "perl$Config{api_revision}$Config{api_version}";
     print "LIBRARY $dll\n";
     # The DESCRIPTION module definition file statement is not supported
     # by VC7 onwards.
@@ -1319,7 +1320,7 @@ elsif ($ARGS{PLATFORM} eq 'aix') {
 }
 elsif ($ARGS{PLATFORM} eq 'netware') {
        if ($ARGS{FILETYPE} eq 'def') {
-       print "LIBRARY perl515\n";
+       print "LIBRARY perl$Config{api_revision}$Config{api_version}\n";
        print "DESCRIPTION 'Perl interpreter for NetWare'\n";
        print "EXPORTS\n";
        }