X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fmakerel;h=f51b4a547878e919e0a64871bb1244b5e65f7792;hb=8cd2b3b0459aa552389179eb3ecd4bc82ce1627b;hp=72005b48416cf3be31a5e06a88bd55d787f439d6;hpb=48e117bb377f900d5a825f4d5684508055bf832c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/makerel b/Porting/makerel
index 72005b4..f51b4a5 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -20,10 +20,10 @@ die "Must be in root of the perl source tree.\n"
 open PATCHLEVEL,"<patchlevel.h" or die;
 my @patchlevel_h = <PATCHLEVEL>;
 close PATCHLEVEL;
-my $patchlevel_h = join "", grep { /^#define/ } @patchlevel_h;
+my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h;
 print $patchlevel_h;
-$patchlevel = $1 if $patchlevel_h =~ /PATCHLEVEL\s+(\d+)/;
-$subversion = $1 if $patchlevel_h =~ /SUBVERSION\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);
@@ -80,7 +80,7 @@ $cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $relroot/$reldir";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";
 
-chdir $relroot or die $!;
+chdir "$relroot/$reldir" or die $!;
 
 print "Setting file permissions...\n";
 system("find . -type f -print     | xargs chmod -w");
@@ -93,7 +93,6 @@ my @exe = qw(
     installperl
     installman
     keywords.pl
-    myconfig
     opcode.pl
     perly.fixer
     t/TEST
@@ -106,6 +105,29 @@ my @exe = qw(
     Porting/makerel
 );
 system("chmod +x @exe");
+
+my @writables = qw(
+    embed.h
+    embedvar.h
+    ext/B/B/Asmdata.pm
+    ext/ByteLoader/byterun.c
+    ext/ByteLoader/byterun.h
+    global.sym
+    keywords.h
+    lib/warnings.pm
+    objXSUB.h
+    opcode.h
+    pp.sym
+    pp_proto.h
+    regnodes.h
+    warnings.h
+    win32/config_H.bc
+    win32/config_H.gc
+    win32/config_H.vc
+);
+system("chmod +w @writables");
+
+print "Adding CRs to DOSish files...\n";
 my @crlf = qw(
     djgpp/configure.bat
     README.dos
@@ -116,6 +138,8 @@ my @crlf = qw(
 system("perl -pi -e 's/\$/\\r/' @crlf");
 print "\n";
 
+chdir ".." 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 > $reldir.tar.gz";