djgpp updates

Message-ID: <20010619105906.C5600@libra.eth.ericsson.se>

p4raw-id: //depot/perl@10718

diff --git a/djgpp/config.over b/djgpp/config.over
index 9e66eef..a040ece 100644 (file)
--- a/djgpp/config.over
+++ b/djgpp/config.over
@@ -41,7 +41,7 @@ repair()
      -e 's=digest/md5=Digest/MD5=' \
      -e 's=perlio/scalar=PerlIO/Scalar=' \
      -e 's=mime/base64=MIME/Base64=' \
-     -e 's=time/hires=Time/HiRes='
+     -e 's=time/hires=Time/HiRes=' \
      -e 's=list/util=List/Util=' \
      -e 's=time/piece=Time/Piece='
 }

diff --git a/djgpp/fixpmain b/djgpp/fixpmain
index 6b0591c..3f965f1 100644 (file)
--- a/djgpp/fixpmain
+++ b/djgpp/fixpmain
@@ -20,7 +20,9 @@ for $realname (@exts)
 {
     $dosname=join ("__",map {lc substr ($_,0,8)} split /\//,$realname);
     $realname =~ s!/!__!g;
-    $perlmain =~ s/\bboot_$dosname/boot_$realname/gm;
+    $perlmain =~ s/\bboot_$dosname\b/boot_$realname/gm;
+    $dosname =~ s/__/::/;
+    $realname =~ s/__/::/;
     $perlmain =~ s/\b$dosname(::bootstrap)/$realname$1/gm;
 }