summaryrefslogtreecommitdiffstats
path: root/tmake/bin/tmake
diff options
context:
space:
mode:
Diffstat (limited to 'tmake/bin/tmake')
-rwxr-xr-xtmake/bin/tmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmake/bin/tmake b/tmake/bin/tmake
index 4862c3f..9158d7a 100755
--- a/tmake/bin/tmake
+++ b/tmake/bin/tmake
@@ -457,7 +457,7 @@ sub Project {
$r = "";
foreach ( @settings ) {
$v = $_;
- if ( $v =~ s/^\s*((?:[^:\s]*?:)?)(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) {
+ if ( $v =~ s/^\s*([^:\r\n]+:)?(\w+)\s*(\+=|\*=|\-=|\/=|=)// ) {
$if_var = $1;
if ( $if_var ne "" ) {
chop $if_var;
@@ -550,7 +550,7 @@ sub ScanProject {
s/\#.*//; # strip comment
s/^\s+//; # strip white space
s/\s+$//;
- if ( /^\s*((?:(?:[^:\s]*?:)?)\w+\s*(\+|\-|\*|\/)?=)/ ) {
+ if ( /^(([^:\r\n]+:)?\w+\s*(\+|\-|\*|\/)?=)/ ) {
$var = $1; # var also contains the ".="
s/^.*?=\s*//;
if ( /^\<\<(.*)$/ ) {