Do away with the fix_pl.

p4raw-id: //depot/perl@7458

diff --git a/MANIFEST b/MANIFEST
index ec689df..bb74326 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -429,7 +429,6 @@ ext/re/re.xs                re extension external subroutines
 ext/util/make_ext      Used by Makefile to execute extension Makefiles
 ext/util/mkbootstrap   Turns ext/*/*_BS into bootstrap info
 fakethr.h              Fake threads header
-fix_pl                 Fix up patchlevel.h for repository perls
 form.h                 Public declarations for the above
 global.sym             Symbols that need hiding when embedded
 globals.c              File to declare global symbols (for shared library)

diff --git a/Makefile.SH b/Makefile.SH
index 6680a59..55ffb2c 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -324,14 +324,6 @@ ext.libs: $(static_ext)
 
 !NO!SUBS!
 
-# if test -f .patch ; then $spitshell >>Makefile <<'!NO!SUBS!' 
-# patchlevel.h: .patch
-#      perl fix_pl || (make -f Makefile.micro && ./microperl fix_pl)
-#      $(SHELL) Makefile.SH
-# fi
-# 
-# !NO!SUBS!
-
 # How to build libperl.  This is still rather convoluted.
 # Load up custom Makefile.SH fragment for shared loading and executables:
 case "$osname" in

diff --git a/fix_pl b/fix_pl
deleted file mode 100644 (file)
index 44c3f52..0000000
--- a/fix_pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!perl
-# Not fixing perl, but fixing the patchlevel if this perl comes
-# from the repository rather than an official release
-exit unless -e ".patch";
-open PATCH, ".patch" or die "Couldn't open .patch: $!";
-open PLIN, "patchlevel.h" or die "Couldn't open patchlevel.h : $!";
-open PLOUT, ">patchlevel.new" or die "Couldn't write on patchlevel.new : $!";
-my $pl = <PATCH>;
-chomp ($pl);
-$pl =~ s/\D//g;
-my $seen=0;
-while (<PLIN>) {
-    if (/\t,NULL/ and $seen) {
-        print PLOUT "\t,\"devel-$pl\"\n";
-    }
-    $seen++ if /local_patches\[\]/;
-    print PLOUT;
-}
-close PLOUT; close PLIN;
-rename "patchlevel.new", "patchlevel.h" or die "Couldn't rename: $!";
-unlink ".patch";