X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2FMakefile.SH;h=68c63a774428a54b5f8172be3ac398254ca7f77e;hb=03e60089f91d0a4a765dc827f0f6b27465941491;hp=5db022fd37ac918e8aea6c1b55461605c270d7ba;hpb=08e61bccdfbdea504a137785230ae6bd350c2bdb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 5db022f..68c63a7 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -1,4 +1,4 @@
-case $CONFIGDOTSH in
+case $PERL_CONFIG_SH in
 '')
 	if test -f config.sh; then TOP=.;
 	elif test -f ../config.sh; then TOP=..;
@@ -58,6 +58,8 @@ FIRSTMAKEFILE = $firstmakefile
 
 TRNL = '$trnl'
 
+OPTIMIZE = $optimize
+
 .SUFFIXES: .c \$(OBJ_EXT)
 
 !GROK!THIS!
@@ -65,7 +67,7 @@ TRNL = '$trnl'
 cat >>Makefile <<'!NO!SUBS!'
 
 REALPERL = ../perl
-CCCMD = `sh $(shellflags) cflags $@`
+CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@`
 
 public = a2p s2p find2perl
 
@@ -102,7 +104,7 @@ all: $(public) $(private) $(util)
 	@echo " "
 
 compile: all
-	$(REALPERL) -I../lib ../utils/perlcc -regex 's/$$/.exe/' $(plextract) -prog -verbose dcf -log ../compilelog;  
+	$(REALPERL) -I../lib ../utils/perlcc -I .. -L .. $(plextract) -v -log ../compilelog;  
 
 a2p: $(obj) a2p$(OBJ_EXT)
 	$(CC) -o a2p $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs)
@@ -119,6 +121,7 @@ run_byacc:	FORCE check_byacc
 	$(BYACC) a2p.y
 	rm -f 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://' \