diff options
author | Peter Powell <petpow@saberuk.com> | 2019-09-07 12:54:29 +0100 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2019-09-07 12:54:29 +0100 |
commit | 1cf76f8aae0d2be86f85c7abfc3b885f2d6a6441 (patch) | |
tree | ef6e75e4218096cf4f7a0b4909c65a91b8315666 /make | |
parent | 685dfe016e406d09a7445e1693d2317afe25ba7a (diff) |
Respect indentation in configure template declarations.
Diffstat (limited to 'make')
-rw-r--r-- | make/configure.pm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/make/configure.pm b/make/configure.pm index 0a7ea566a..81a655f11 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -284,21 +284,21 @@ sub parse_templates($$$) { } # Does this line match a directive? - if ($line =~ /^\s*%(\w+)\s+(.+)$/) { - if ($1 eq 'define') { - if ($settings{$2}) { - push @lines, "#define $2"; + if ($line =~ /^(\s*)%(\w+)\s+(.+)$/) { + if ($2 eq 'define') { + if ($settings{$3}) { + push @lines, "#$1define $3"; } else { - push @lines, "#undef $2"; + push @lines, "#$1undef $3"; } - } elsif ($1 eq 'mode') { - $mode = oct $2; - } elsif ($1 eq 'platform') { - push @platforms, $2; - } elsif ($1 eq 'target') { - push @targets, $2 + } elsif ($2 eq 'mode') { + $mode = oct $3; + } elsif ($2 eq 'platform') { + push @platforms, $3; + } elsif ($2 eq 'target') { + push @targets, $3 } else { - print_warning "unknown template command '$1' in $_!"; + print_warning "unknown template command '$2' in $_!"; push @lines, $line; } next; |