de-$CONFIG continues.

[perl5.git] / x2p / Makefile.SH

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 5bec7a0..3dedb47 100755 (executable)
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $PERL_CONFIG_TSH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -34,10 +34,9 @@ cat >Makefile <<!GROK!THIS!
 CC = $cc
 BYACC = $byacc
 LDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-mallocsrc = $mallocsrc
-mallocobj = $mallocobj
+# XXX Perl malloc temporarily unusable (declaration collisions with stdlib.h)
+#mallocsrc = $mallocsrc
+#mallocobj = $mallocobj
 shellflags = $shellflags
 
 libs = $libs
@@ -83,6 +82,7 @@ pl = find2perl.PL s2p.PL
 plextract = find2perl s2p
 plexe = find2perl.exe s2p.exe
 plc   = find2perl.c s2p.c
+plm   = a2p.loadmap
 
 addedbyconf = $(shextract) $(plextract)
 
@@ -111,11 +111,23 @@ a2p: $(obj) a2p$(OBJ_EXT)
 # used only if you force byacc to run by saying
 # make  run_byacc
 
-run_byacc:     FORCE
+check_byacc:
+       @$(BYACC) -V 2>&1 | grep 'version 1\.8\.2'
+
+run_byacc:     FORCE check_byacc
        @ echo Expect many shift/reduce and reduce/reduce conflicts
        $(BYACC) a2p.y
        rm -f a2p.c
-       mv y.tab.c a2p.c
+       sed -e 's/(yyn = yydefred\[yystate\])/((yyn = yydefred[yystate]))/' \
+           -e 's/(yys = getenv("YYDEBUG"))/((yys = getenv("YYDEBUG")))/' \
+           -e 's/^yyerrlab://' \
+           -e 's/^    goto yyerrlab;//' \
+           -e 's/^yynewerror://' \
+           -e 's/^    goto yynewerror;//' \
+           -e 's|^static char yysccsid\(.*\)|/* static char yysccsid\1 */|' \
+           < y.tab.c > a2p.c
+
+FORCE:
 
 # We don't want to regenerate a2p.c, but it might appear out-of-date
 # after a patch is applied or a new distribution is made.
@@ -124,15 +136,18 @@ a2p.c: a2p.y
 
 a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h \
                ../handy.h ../config.h str.h hash.h
-       $(CCCMD) $(LARGE) a2p.c
+       $(CCCMD) a2p.c
 
 clean:
-       rm -f a2p *$(OBJ_EXT) $(plexe) $(plc)
+       rm -f a2p psed *$(OBJ_EXT) $(plexe) $(plc) $(plm)
 
 realclean: clean
-       rm -f *.orig core $(addedbyconf) all malloc.c
+       rm -f core $(addedbyconf) all malloc.c
        rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
 
+veryclean: realclean
+       rm -f *~ *.orig
+
 # The following lint has practically everything turned on.  Unfortunately,
 # you have to wade through a lot of mumbo jumbo that can't be suppressed.
 # If the source file has a /*NOSTRICT*/ somewhere, ignore the lint message