diff options
| author | Nicholas Clark <nick@ccl4.org> | 2011-08-11 14:35:02 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2011-08-13 22:11:32 +0200 |
| commit | d9f179d8be3032dd79198d1b604a6e3e677455be (patch) | |
| tree | cd125e0a7b72750ee2e4470ce254e377b4f62f13 | |
| parent | de4da25d0cf392a81f2d8e1699d88d3b720683a1 (diff) | |
| download | perl-d9f179d8be3032dd79198d1b604a6e3e677455be.tar.gz | |
In makedef.pl, use %Config to avoid hardcoding the DLL version number.
| -rw-r--r-- | Porting/bump-perl-version | 2 | ||||
| -rw-r--r-- | makedef.pl | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version index 5b6e199590..a0b83110f3 100644 --- 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 5841d69f19..a4b5ced556 100644 --- 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"; } |