X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=writemain.SH;h=0b5bd07600d8c4572fa4cfae7119ddb8e921384c;hb=c067b4bea65bd7b97b0ae4f7b058dd94b44a4c48;hp=c42838308541d28717012ab45f40b26021b63578;hpb=a3c8358ce414426ff5d7d0ca29f8d98f18d4c878;p=p5sagit%2Fp5-mst-13.2.git diff --git a/writemain.SH b/writemain.SH old mode 100755 new mode 100644 index c428383..0b5bd07 --- a/writemain.SH +++ b/writemain.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $PERL_CONFIG_SH 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,19 +65,19 @@ 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) { EOP if test X"$args" != "X" ; then - echo " char *file = __FILE__;" + echo " const char file[] = __FILE__;" echo " dXSUB_SYS;" ai=''