muscle: factor conditionals on defined %define variables

[bison.git] / tests / bison.in

diff --git a/tests/bison.in b/tests/bison.in
index f21b2bcd5221bd45e4e90a6163a63ab42c4789c9..5c5881f773a00c15758d20cfb82f9c2529500f7f 100644 (file)
--- a/tests/bison.in
+++ b/tests/bison.in
@@ -2,7 +2,7 @@
 # @configure_input@
 # Wrapper around a non installed bison to make it work as an installed one.
 
 # @configure_input@
 # Wrapper around a non installed bison to make it work as an installed one.
 

-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.

 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -34,14 +34,15 @@ status=$?
 for i
 do
   case $i in
 for i
 do
   case $i in

-    */parse-gram.y)
+    */src/parse-gram.y)

     if $PERL --version >/dev/null; then
     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;' \
+      # We are called by ylwrap which (if it's an old version) 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\.[chy])"}{"src/$1"}g;'       \
+                -e 's{GRAM_Y_TAB_H}{GRAM_SRC_PARSE_GRAM_H}g;'           \

            y.tab.[ch]
     fi
     ;;
            y.tab.[ch]
     fi
     ;;