Integrated win32 branch into mainline. The changes to t/op/ipc*.t

in change 1043 clashed badly with changes made in the win32
branch. I did an accept on the win32 branch version for now.

p4raw-id: //depot/perl@1048

2 files changed, 14 insertions, 8 deletions

diff --git a/Porting/Contract b/Porting/Contract
index 75a24a7a31..cc91af26bc 100644
--- a/Porting/Contract
+++ b/Porting/Contract
@@ -1,3 +1,4 @@
+
                      Contributed Modules in Perl Core
                  A Social Contract about Artistic Control
 
@@ -101,3 +102,7 @@ should be open communication, respect for opposing views, and an attempt
 at a compromise.  In nearly every circumstance nothing more will be
 necessary, and certainly no more drastic measure should be used until
 every avenue of communication and discussion has failed.
+
+-- 
+Version 1.2.  By Russ Allbery (rra@stanford.edu) and the perl5-porters.
+
diff --git a/Porting/makerel b/Porting/makerel
index d6582edba1..5a7cd8b967 100644
--- a/Porting/makerel
+++ b/Porting/makerel
@@ -32,10 +32,10 @@ if ($subversion) {
 }
 
 $perl = "perl$vers";
-$reldir = "$relroot/$perl";
+$reldir = "$perl";
 $reldir .= "-$ARGV[0]" if $ARGV[0];
 
-print "\nMaking a release for $perl in $reldir\n\n";
+print "\nMaking a release for $perl in $relroot/$reldir\n\n";
 
 
 print "Cross-checking the MANIFEST...\n";
@@ -87,23 +87,24 @@ system("chmod +x @exe");
 print "\n";
 
 
-print "Creating $reldir release directory...\n";
-die "$reldir release directory already exists\n"   if -e "../$reldir";
-die "$reldir.tar.gz release file already exists\n" if -e "../$reldir.tar.gz";
-mkdir($reldir, 0755) or die "mkdir $reldir: $!\n";
+print "Creating $relroot/$reldir release directory...\n";
+die "$relroot/$reldir release directory already exists\n"   if -e "$relroot/$reldir";
+die "$relroot/$reldir.tar.gz release file already exists\n" if -e "$relroot/$reldir.tar.gz";
+mkdir("$relroot/$reldir", 0755) or die "mkdir $relroot/$reldir: $!\n";
 print "\n";
 
 
 print "Copying files to release directory...\n";
 # ExtUtils::Manifest maniread does not preserve the order
-$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $reldir";
+$cmd = "awk '{print \$1}' MANIFEST | cpio -pdm $relroot/$reldir";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";
 
 chdir $relroot or die $!;
 
 print "Creating and compressing the tar file...\n";
-$cmd = "tar cf - $perl | gzip --best > $perl.tar.gz";
+my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch
+$cmd = "tar cf - $reldir | gzip --best > $perl.tar.gz";
 system($cmd) == 0 or die "$cmd failed";
 print "\n";