DJGPP tweaks from Laszlo Molnar.

p4raw-id: //depot/perl@13420

diff --git a/djgpp/config.over b/djgpp/config.over
index 55eef9b..8d6bb3e 100644 (file)
--- a/djgpp/config.over
+++ b/djgpp/config.over
@@ -46,7 +46,7 @@ repair()
      -e 's=cwd=Cwd=' \
      -e 's=perlio/via=PerlIO/Via=' \
      -e 's=xs/typemap=XS/Typemap=' \
-     -e 's=unicode/normalize=Unicode/Normalize=' \
+     -e 's=unicode/normalize?=Unicode/Normalize=' \
      -e 's=i18n/langinfo=I18N/Langinfo='
 }
 static_ext=$(repair "$static_ext")

diff --git a/djgpp/djgppsed.sh b/djgpp/djgppsed.sh
index bb35eb0..fb140a3 100644 (file)
--- a/djgpp/djgppsed.sh
+++ b/djgpp/djgppsed.sh
@@ -17,7 +17,7 @@ SCOR='s=c\\\.c|=c\_c|=g'
 SHSED='s=\.\(hsed\)=_\1=g'
 SDEPTMP='s=\.\(deptmp\)=_\1=g'
 SCPP='s=\.\(cpp\.\)=_\1=g'
-SARGV='s=\.\(argv\)\.=_\1_=g'
+SARGV='s=Io_argv\(.\)\.=i\1_=g'
 SABC='s=\.\([abc][^a]\)=_\1=g'
 SDBMX='s=\.\(dbmx\)=_\1=g'
 SDBHASH='s=dbhash\.tmp=dbhash_tmp=g'