Add patch for Debian_730599.
Hilmar Preuße
10 years ago
| 0 | --- trunk/tp/texi2any.pl 2014/02/25 23:42:47 5419 | |
| 1 | +++ trunk/tp/texi2any.pl 2014/03/14 22:51:57 5420 | |
| 2 | @@ -806,6 +806,7 @@ | |
| 3 | $makeinfo_help .= __("Input file options: | |
| 4 | --commands-in-node-names does nothing, retained for compatibility. | |
| 5 | -D VAR define the variable VAR, as with \@set. | |
| 6 | + -D 'VAR VAL' define VAR to VAL (one shell argument). | |
| 7 | -I DIR append DIR to the \@include search path. | |
| 8 | -P DIR prepend DIR to the \@include search path. | |
| 9 | -U VAR undefine the variable VAR, as with \@clear.\n") | |
| 10 | @@ -924,7 +925,15 @@ | |
| 11 | document_warn($message); | |
| 12 | } | |
| 13 | }, | |
| 14 | - 'D=s' => sub {$parser_default_options->{'values'}->{$_[1]} = 1;}, | |
| 15 | + 'D=s' => sub { | |
| 16 | + my $var = $_[1]; | |
| 17 | + my @field = split (/\s+/, $var, 2); | |
| 18 | + if (@field == 1) { | |
| 19 | + $parser_default_options->{'values'}->{$var} = 1; | |
| 20 | + } else { | |
| 21 | + $parser_default_options->{'values'}->{$field[0]} = $field[1]; | |
| 22 | + } | |
| 23 | + }, | |
| 24 | 'U=s' => sub {delete $parser_default_options->{'values'}->{$_[1]};}, | |
| 25 | 'init-file=s' => sub { | |
| 26 | locate_and_load_init_file($_[1], [ @conf_dirs, @program_init_dirs ]); |