diff options
| author | hinder <hinder@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-01-26 15:27:10 +0000 |
|---|---|---|
| committer | hinder <hinder@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-01-26 15:27:10 +0000 |
| commit | 41c3aff8783cf9548cdcb1aaac34ab6dca984e22 (patch) | |
| tree | addaeba94dc2225701e8f6e9af2b817a5b7acd57 /lib | |
| parent | 58a8fac49f463ea677dcf71321b601ceec934c78 (diff) | |
Remove whitespace from option values passed on the "make" command line
The regular expression used to match variable settings was absorbing
whitespace into the variable value. Changing to a non-greedy RE fixes
this. This problem caused GSL to not find its directory, as it didn't
expect a space on the end of GSL_DIR.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4667 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/make/setup_configuration.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/make/setup_configuration.pl b/lib/make/setup_configuration.pl index 76ff6f59..3f455d57 100755 --- a/lib/make/setup_configuration.pl +++ b/lib/make/setup_configuration.pl @@ -123,7 +123,7 @@ sub SetConfigureEnv $commandline = $ENV{"MAKEFLAGS"}; $line_number = 0; # while ($commandline =~ /^(.*)\s+(\w+)\s*=\s*([_+\-\.\w\\\/\s]*)\s*/) - while ($commandline =~ /^(.*)\s*\b(\w+)\s*=\s*(.*)\s*$/) + while ($commandline =~ /^(.*)\s*\b(\w+)\s*=\s*(.*?)\s*$/) { if ($2 ne 'options' && $2 ne 'SILENT') { |