diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-07-21 21:27:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:54 -0500 |
| commit | c84512f0e1c1dd6ac0cb3e9b5e2fbb2f3c0d4eb1 (patch) | |
| tree | 81abe1ecfa802a9d77ec4aa27e7b3df134d7e2e2 /source4/build/smb_build/main.pm | |
| parent | 2a65d17e06da3b1f1f78d9586fd82a79ba2f73a6 (diff) | |
| download | samba-c84512f0e1c1dd6ac0cb3e9b5e2fbb2f3c0d4eb1.tar.gz samba-c84512f0e1c1dd6ac0cb3e9b5e2fbb2f3c0d4eb1.tar.bz2 samba-c84512f0e1c1dd6ac0cb3e9b5e2fbb2f3c0d4eb1.zip | |
r8690: Code cleanups, improvements necessary for dependencies (not added yet)
(This used to be commit 7384b3c4a1450ad63356dcf586e3a7e7335f8e6d)
Diffstat (limited to 'source4/build/smb_build/main.pm')
| -rw-r--r-- | source4/build/smb_build/main.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index 6e027af45a..950d02a2f6 100644 --- a/source4/build/smb_build/main.pm +++ b/source4/build/smb_build/main.pm @@ -18,15 +18,17 @@ my $config_list = "config.list"; sub smb_build_main($$) { - my $INPUT = shift; - my $settings = shift; + my ($INPUT, $settings) = @_; - my @mkfiles = split('\n', `grep -v ^# $config_list`); + open(IN, $config_list) or die("Can't open $config_list: $!"); + my @mkfiles = grep{!/^#/} <IN>; + close(IN); $| = 1; - for my $mkfile (@mkfiles) { - config_mk::import_file($INPUT, $mkfile); + foreach (@mkfiles) { + s/\n//g; + config_mk::import_file($INPUT, $_); } my $DEPEND = input::check($INPUT); |