maint: fix use of copyright year intervals.

[bison.git] / build-aux / cross-options.pl

diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 6d153a05dbb35930f16e5cf2a5fdbfeb37a5ed9b..7762e276c27d60cf3e985136f062a7d0930be093 100755 (executable)
--- a/build-aux/cross-options.pl
+++ b/build-aux/cross-options.pl
@@ -22,7 +22,11 @@ while (<STDIN>)
        $short = '' if ! defined $short;
        $short = '-d' if $long eq '--defines' && ! $short;
        my $dir = '%' . substr($long, 2);
-       $dir = '' if index ($scanner, "\"$dir\"") < 0;
+       if (index ($scanner, "\"$dir\"") < 0)
+       {
+         if ($long eq '--force-define') { $dir = '%define'; }
+         else { $dir = ''; }
+       }
        if ($arg)
        {
             # if $opt, $arg contains the closing ].
@@ -35,8 +39,11 @@ while (<STDIN>)
             # put each word in @var, to build @var{name}[=@var{value}], not
             # @var{name[=value]}].
            $arg =~ s/(\w+)/\@var{$1}/g;
-           $arg = '[' . $arg . ']'
-               if $opt eq '[';
+           my $long_arg = "=$arg";
+           if ($opt eq '[') {
+             $long_arg = "[$long_arg]";
+             $arg = "[$arg]";
+           }
            # For arguments of directives: this only works if all arguments
            # are strings and have the same syntax as on the command line.
            if ($dir_arg eq 'name[=value]')
@@ -49,7 +56,7 @@ while (<STDIN>)
                $dir_arg = '[' . $dir_arg . ']'
                    if $opt eq '[';
            }
-           $long = "$long=$arg";
+           $long = "$long$long_arg";
            $short = "$short $arg" if $short && $short ne '-d';
            $dir = "$dir $dir_arg" if $dir;
        }