Update CPANPLUS-Dist-Build to CPAN version 0.52

[perl5.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 2c0b5c1..127d6f9 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -26,6 +26,14 @@ esac
 
 echo "Extracting x2p/Makefile (with variable substitutions)"
 rm -f Makefile
+
+# The .PL extractions use the Cwd extension.  For statically-built
+# perls, we need perl, not just miniperl.
+case "$usedl" in
+    define) perl="../miniperl" ;;
+    *)      perl="../perl" ;;
+esac
+
 cat >Makefile <<!GROK!THIS!
 # $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $
 #
@@ -47,7 +55,7 @@ SHELL = $sh
 
 # These variables may need to be manually set for non-Unix systems.
 AR = $ar
-EXE_EXT = $_ext
+EXE_EXT = $_exe
 LIB_EXT = $_a
 OBJ_EXT = $_o
 PATH_SEP = $p_
@@ -62,6 +70,9 @@ OPTIMIZE = $optimize
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
+RUN = $run
+PERL = $perl
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -122,6 +133,9 @@ run_byacc:  FORCE
            -e 's/^yynewerror://' \
            -e 's/^    goto yynewerror;//' \
            -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+           -e 's/^\(char \*yyname\[\]\)/const \1/' \
+           -e 's/^\(char \*yyrule\[\]\)/const \1/' \
+           -e 's/^\(    register\) \(char \*yys;\)/\1 const \2/' \
            < y.tab.c > a2p.c
 
 FORCE:
@@ -138,6 +152,8 @@ a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
 clean:
        rm -f a2p$(EXE_EXT) psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
+distclean: veryclean
+
 realclean: clean
        -rmdir .depending
        rm -f core $(addedbyconf) all malloc.c
@@ -166,10 +182,8 @@ hlist:
 shlist:
        echo $(sh) | tr ' ' $(TRNL) >.shlist
 
-# These should be automatically generated
-
 $(plextract):
-       ../miniperl -I../lib $@.PL
+       $(RUN) $(PERL) -I../lib $@.PL
 
 find2perl: find2perl.PL