summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/config_mk.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-13 18:20:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:47 -0500
commit270a1a3eb31adbc6b785112e03b41decac6c3aad (patch)
tree9cc8e2807528abaab96299af8590e3247f07b6b1 /source4/build/smb_build/config_mk.pm
parent3b217ffcf2788af8405594c618507cd65ef281c7 (diff)
downloadsamba-270a1a3eb31adbc6b785112e03b41decac6c3aad.tar.gz
samba-270a1a3eb31adbc6b785112e03b41decac6c3aad.tar.bz2
samba-270a1a3eb31adbc6b785112e03b41decac6c3aad.zip
r3726: More simplifications/fixes in the build system
(This used to be commit e32f87fdea3070ea715ef547f2a406aa63ab775f)
Diffstat (limited to 'source4/build/smb_build/config_mk.pm')
-rw-r--r--source4/build/smb_build/config_mk.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index f852e345ac..7b8fbd93c3 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -220,8 +220,8 @@ sub _fetch_array_from_config_mk($$$)
my $filename = shift;
my $section = shift;
my $key = shift;
- my @val = ();
my $result;
+ my $val = "";
$result = _get_parse_results($filename);
@@ -230,12 +230,12 @@ sub _fetch_array_from_config_mk($$$)
}
if (defined($result->{$section}{$key})) {
- @val = input::str2array($result->{$section}{$key}{VAL});
+ $val = $result->{$section}{$key}{VAL};
} elsif (defined($result->{DEFAULT}{$key})) {
- @val = input::str2array($result->{DEFAULT}{$key}{VAL});
- }
+ $val = $result->{DEFAULT}{$key}{VAL};
+ }
- return @val;
+ return input::str2array($val);
}
###########################################################