Fix the compile for -DPERL_OLD_COPY_ON_WRITE (apart from the tenacious

[p5sagit/p5-mst-13.2.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index db86be8..ba56c49 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -39,7 +39,7 @@ LDFLAGS = $ldflags
 #mallocobj = $mallocobj
 shellflags = $shellflags
 
-libs = $libs
+libs = $perllibs
 
 $make_set_make
 # grrr
@@ -47,7 +47,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 +62,8 @@ OPTIMIZE = $optimize
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
+RUN = $run
+
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -103,20 +105,15 @@ lintflags = -phbvxac
 all: $(public) $(private) $(util)
        @echo " "
 
-compile: all
-       $(REALPERL) -I../lib ../utils/perlcc -I .. -L .. $(plextract) -v -log ../compilelog;  
-
 a2p$(EXE_EXT): $(obj) a2p$(OBJ_EXT)
        $(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
 
 # I now supply a2p.c with the kits, so the following section is
 # used only if you force byacc to run by saying
-# make  run_byacc
-
-check_byacc:
-       @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2'
+#    make run_byacc
+# byacc 1.8.2 or 1.9 are recommended.
 
-run_byacc:     FORCE check_byacc
+run_byacc:     FORCE
        @ echo Expect many shift/reduce and reduce/reduce conflicts
        $(BYACC) a2p.y
        rm -f a2p.c
@@ -127,6 +124,9 @@ run_byacc:  FORCE check_byacc
            -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:
@@ -146,7 +146,7 @@ clean:
 realclean: clean
        -rmdir .depending
        rm -f core $(addedbyconf) all malloc.c
-       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
+       rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old
 
 veryclean: realclean
        rm -f *~ *.orig
@@ -174,7 +174,11 @@ shlist:
 # These should be automatically generated
 
 $(plextract):
-       ../miniperl -I../lib $@.PL
+       $(RUN) ../miniperl -I../lib $@.PL
+
+find2perl: find2perl.PL
+
+s2p: s2p.PL
 
 malloc.c: ../malloc.c
        rm -f malloc.c