Merge remote-tracking branch 'origin/maint'

[bison.git] / tests / bison.in

diff --git a/tests/bison.in b/tests/bison.in
index 4dfeb791ae217f1203cb44867d8c81e712e2f6e0..b8e0e057817aefbafda3ec0630a4d86624956890 100644 (file)
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -19,7 +19,7 @@
 
 abs_top_srcdir='@abs_top_srcdir@'
 abs_top_builddir='@abs_top_builddir@'
-: ${PERL=perl}
+: ${PERL='@PERL@'}
 
 # Use the shipped files, not those installed.
 BISON_PKGDATADIR=$abs_top_srcdir/data
@@ -34,14 +34,15 @@ status=$?
 for i
 do
   case $i in
-    */parse-gram.y)
+    */src/parse-gram.y)
     if $PERL --version >/dev/null; then
       # We are called by ylwrap which still uses y.tab.*, and
       # post-processes the synclines on y.tab.c itself.  Don't let it
       # do it.  Besides, it leaves "parse-gram.y" as the source,
       # dropping the src/ part.
-      $PERL -pi -e 's{"y\.tab\.}{"parse-gram.}g;'    \
-                -e 's{".*/(parse-gram\.y)"}{"$1"}g;' \
+      $PERL -pi -e 's{"y\.tab\.}{"src/parse-gram.}g;'           \
+                -e 's{".*/(parse-gram\.y)"}{"src/$1"}g;'        \
+                -e 's{GRAM_Y_TAB_H}{GRAM_SRC_PARSE_GRAM_H}g;'        \
            y.tab.[ch]
     fi
     ;;