tests: diff -u is not portable

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

diff --git a/build-aux/cross-options.pl b/build-aux/cross-options.pl
index 8d507254b5046810ca5a8aae9c12299b56c9de5c..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);
        $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 ].
        if ($arg)
        {
             # if $opt, $arg contains the closing ].


@@ -61,9 +65,12 @@ while (<STDIN>)
     }
 }
 
     }
 }
 

+my $sep = '';

 foreach my $long (sort keys %option)
 {
     # Avoid trailing spaces.
 foreach my $long (sort keys %option)
 {
     # Avoid trailing spaces.

+    print $sep;
+    $sep = "\n";

     print '@item @option{', $long, "}\n\@tab";
     print ' @option{', $option{$long}, '}' if $option{$long};
     print "\n\@tab";
     print '@item @option{', $long, "}\n\@tab";
     print ' @option{', $option{$long}, '}' if $option{$long};
     print "\n\@tab";