Configure nits: rewording from Sarathy (aka #5796),

[perl5.git] / Porting / makerel

diff --git a/Porting/makerel b/Porting/makerel
index ea99c67..4b8c277 100644 (file)
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -22,17 +22,12 @@ my @patchlevel_h = <PATCHLEVEL>;
 close PATCHLEVEL;
 my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
 print $patchlevel_h;
+$revision = $1 if $patchlevel_h =~ /PERL_REVISION\s+(\d+)/;
 $patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION\s+(\d+)/;
 $subversion = $1 if $patchlevel_h =~ /PERL_SUBVERSION\s+(\d+)/;
 die "Unable to parse patchlevel.h" unless $subversion >= 0;
-$vers = sprintf("5.%03d", $patchlevel);
-$vms_vers = sprintf("5_%03d", $patchlevel);
-if ($subversion) {
-    $vers.= sprintf( "_%02d", $subversion);
-    $vms_vers.= sprintf( "%02d", $subversion);
-} else {
-    $vms_vers.= "  ";
-}
+$vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion);
+$vms_vers = sprintf("%d_%d_%d", $revision, $patchlevel, $subversion);
 
 # fetch list of local patches
 my (@local_patches, @lpatch_tags, $lpatch_tags);
@@ -41,7 +36,7 @@ my (@local_patches, @lpatch_tags, $lpatch_tags);
 @lpatch_tags   = map  {  /^\s*,"(\w+)/ } @local_patches;
 $lpatch_tags   = join "-", @lpatch_tags;
 
-$perl = "perl$vers";
+$perl = "perl-$vers";
 $reldir = "$perl";
 $reldir .= "-$lpatch_tags" if $lpatch_tags;
 
@@ -114,15 +109,15 @@ my @writables = qw(
     ext/ByteLoader/byterun.h
     global.sym
     keywords.h
-    lib/warning.pm
+    lib/warnings.pm
     objXSUB.h
     opcode.h
     pp.sym
     pp_proto.h
     regnodes.h
-    warning.h
+    warnings.h
     win32/config_H.bc
-    win32/config_h.gc
+    win32/config_H.gc
     win32/config_H.vc
 );
 system("chmod +w @writables");