summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/config_mk.pm
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-12 09:44:27 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-12 09:44:27 +1000
commitb869a525b1f40baf881a725e5632b39c99268d67 (patch)
tree594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/build/smb_build/config_mk.pm
parent00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff)
parent5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff)
downloadsamba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz
samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2
samba-b869a525b1f40baf881a725e5632b39c99268d67.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/build/smb_build/config_mk.pm')
-rw-r--r--source4/build/smb_build/config_mk.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 307c391e07..81c3363cfb 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -244,7 +244,6 @@ sub run_config_mk($$$$)
$infragment = 1;
next;
}
-
# Assignment
if ($line =~ /^([a-zA-Z0-9_]+)[\t ]*=(.*)$/) {
@@ -254,7 +253,7 @@ sub run_config_mk($$$$)
next;
}
- die("$parsing_file:$linenum: Bad line while parsing $parsing_file");
+ die("$parsing_file:$linenum: Bad line");
}
$makefile .= "# }END $parsing_file\n";