merge changes 1424, 1428 from maintbranch

p4raw-id: //depot/perl@1453

1 files changed, 13 insertions, 4 deletions

diff --git a/Porting/makerel b/Porting/makerel
index 809de9bbec..1a00e973a3 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -17,7 +17,10 @@ $relroot = "..";	# XXX make an option
 die "Must be in root of the perl source tree.\n"
 	unless -f "./MANIFEST" and -f "patchlevel.h";
 
-$patchlevel_h = `grep '#define ' patchlevel.h`;
+open PATCHLEVEL,"<patchlevel.h" or die;
+my @patchlevel_h = <PATCHLEVEL>;
+close PATCHLEVEL;
+my $patchlevel_h = join "", grep { /^#define/ } @patchlevel_h;
 print $patchlevel_h;
 $patchlevel = $1 if $patchlevel_h =~ /PATCHLEVEL\s+(\d+)/;
 $subversion = $1 if $patchlevel_h =~ /SUBVERSION\s+(\d+)/;
@@ -31,13 +34,19 @@ if ($subversion) {
     $vms_vers.= "  ";
 }
 
+# fetch list of local patches
+my (@local_patches, @lpatch_tags, $lpatch_tags);
+@local_patches = grep { /^static.*local_patches/../^};/ } @patchlevel_h;
+@local_patches = grep { !/^\s*,?NULL/  } @local_patches;
+@lpatch_tags   = map  {  /^\s*,"(\w+)/ } @local_patches;
+$lpatch_tags   = join "-", @lpatch_tags;
+
 $perl = "perl$vers";
 $reldir = "$perl";
-$reldir .= "-$ARGV[0]" if $ARGV[0];
+$reldir .= "-$lpatch_tags" if $lpatch_tags;
 
 print "\nMaking a release for $perl in $relroot/$reldir\n\n";
 
-
 print "Cross-checking the MANIFEST...\n";
 ($missfile, $missentry) = fullcheck();
 warn "Can't make a release with MANIFEST files missing.\n" if @$missfile;
@@ -101,7 +110,7 @@ chdir $relroot or die $!;
 
 print "Creating and compressing the tar file...\n";
 my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
-$cmd = "tar cf - $reldir | gzip --best > $perl.tar.gz";
+$cmd = "tar cf - $reldir | gzip --best > $reldir.tar.gz";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";