Adjust verbose message to using emacs.

	* etc/bench.pl.in: Inform compilation-mode when we change the
	directory.
	(generate_grammar_list): Recognize %define "variant" in addition
	to %define variant.

1 files changed, 3 insertions, 2 deletions

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index e5133f0e..0679046c 100755
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -575,7 +575,7 @@ sub generate_grammar_list ($$@)
 {
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
-  my $variant = grep { /%define variant/ } @directive;
+  my $variant = grep { /%define "?variant"?/ } @directive;
   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;
@@ -1043,7 +1043,8 @@ mkdir $dir
   or die "cannot create $dir";
 chdir $dir
   or die "cannot chdir $dir";
-verbose 1, "Benching in $dir.\n";
+# The following message is tailored to please Emacs' compilation-mode.
+verbose 1, "Entering directory `$dir'\n";
 verbose 1, "Using bison=$bison.\n";
 verbose 2, "Using cc=$cc.\n";
 verbose 2, "Using cxx=$cxx.\n";