$VERSION crusade, strict, tests, etc... all over lib/

[perl5.git] / writemain.SH

diff --git a/writemain.SH b/writemain.SH
index 66d14a1..18544c1 100644 (file)
--- a/writemain.SH
+++ b/writemain.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $CONFIGDOTSH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -37,7 +37,11 @@ $spitshell >>writemain <<'!NO!SUBS!'
 orig="$*"
 args=''
 : Remove any .a suffixes and any leading path components
-for file in `echo $orig | sed 's/\.a//g'` ; do
+for file in $orig ; do
+        case "$file" in
+           *.a)  file=`echo $file | sed 's/\.a//g'`
+                 ;;
+        esac
        case "$file" in
        ext/*)  file=`echo $file | sed 's:ext/\(.*\)/[^/]*:\1:'`
                ;;
@@ -61,20 +65,21 @@ if test X"$args" != "X" ; then
 mname=`echo $ext   | sed 's!/!::!g'`
 cname=`echo $mname | sed 's!:!_!g'`
 
-echo "EXTERN_C void boot_${cname} _((CV* cv));"
+echo "EXTERN_C void boot_${cname} (pTHX_ CV* cv);"
     done
 fi
 
 cat << 'EOP'
 
 static void
-xs_init()
+xs_init(pTHX)
 {
-  dXSUB_SYS;
 EOP
 
 if test X"$args" != "X" ; then
     echo "    char *file = __FILE__;"
+    echo "    dXSUB_SYS;"
+
     ai=''
 
     for ext in $args ; do
@@ -84,7 +89,6 @@ if test X"$args" != "X" ; then
        mname=`echo $ext   | sed 's!/!::!g'`
        cname=`echo $mname | sed 's!:!_!g'`
 
-       echo "    {"
        if test "$ext" = "DynaLoader"; then
            : Must NOT install 'DynaLoader::boot_DynaLoader' as 'bootstrap'!
            : boot_DynaLoader is called directly in DynaLoader.pm
@@ -92,7 +96,6 @@ if test X"$args" != "X" ; then
        else
            echo "        newXS(\"${mname}::bootstrap\", boot_${cname}, file);"
        fi
-       echo "    }"
     done
 fi