NetBSD update, based on patches from the NetBSD packages system.

[p5sagit/p5-mst-13.2.git] / writemain.SH

diff --git a/writemain.SH b/writemain.SH
index e53af7d..025d954 100644 (file)
--- a/writemain.SH
+++ b/writemain.SH
@@ -21,6 +21,7 @@ echo "Extracting writemain (with variable substitutions)"
 : Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
 : Protect any dollar signs and backticks that you do not want interpreted
 : by putting a backslash in front.  You may delete these comments.
+rm -f writemain
 $spitshell >writemain <<!GROK!THIS!
 $startsh
 !GROK!THIS!
@@ -36,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:'`
                ;;
@@ -73,6 +78,8 @@ EOP
 
 if test X"$args" != "X" ; then
     echo "    char *file = __FILE__;"
+    echo "    dXSUB_SYS;"
+
     ai=''
 
     for ext in $args ; do
@@ -82,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
@@ -90,7 +96,6 @@ if test X"$args" != "X" ; then
        else
            echo "        newXS(\"${mname}::bootstrap\", boot_${cname}, file);"
        fi
-       echo "    }"
     done
 fi