X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=writemain.SH;h=ac1c5aaf45b3e9b625c6f297bd8ffcfdaff8dd0a;hb=9bdb0282d4f16fcaf7658ba3709d04ef5f50dba3;hp=6c53602472cd318bf4228137a2353743703c8bba;hpb=b233458bd1d5037ce4bbbb41fb513e1b68522a4d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/writemain.SH b/writemain.SH
index 6c53602..ac1c5aa 100644
--- a/writemain.SH
+++ b/writemain.SH
@@ -1,4 +1,4 @@
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '')
 	if test -f config.sh; then TOP=.;
 	elif test -f ../config.sh; then TOP=..;
@@ -24,7 +24,6 @@ echo "Extracting writemain (with variable substitutions)"
 rm -f writemain
 $spitshell >writemain <<!GROK!THIS!
 $startsh
-src=$src
 !GROK!THIS!
 
 : In the following dollars and backticks do not need the extra backslash.
@@ -40,8 +39,8 @@ args=''
 : Remove any .a suffixes and any leading path components
 for file in $orig ; do
         case "$file" in
-           *.a)  file=`echo $file | sed 's/\.a//g'`
-                 ;;
+           *.a)  file=`echo $file | sed 's/\.a//g'`;;
+           *.o)  file=`echo $file | sed 's/\.o//g'`;;
         esac
 	case "$file" in
 	ext/*)	file=`echo $file | sed 's:ext/\(.*\)/[^/]*:\1:'`
@@ -56,7 +55,7 @@ for file in $orig ; do
 done
 
 
-sed '/Do not delete this line--writemain depends on it/q' $src/miniperlmain.c
+sed '/Do not delete this line--writemain depends on it/q' miniperlmain.c
 
 
 if test X"$args" != "X" ; then
@@ -78,7 +77,7 @@ xs_init(pTHX)
 EOP
 
 if test X"$args" != "X" ; then
-    echo "    char *file = __FILE__;"
+    echo "    static const char file[] = __FILE__;"
     echo "    dXSUB_SYS;"
 
     ai=''