From c84512f0e1c1dd6ac0cb3e9b5e2fbb2f3c0d4eb1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 21 Jul 2005 21:27:39 +0000 Subject: r8690: Code cleanups, improvements necessary for dependencies (not added yet) (This used to be commit 7384b3c4a1450ad63356dcf586e3a7e7335f8e6d) --- source4/build/smb_build/main.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source4/build/smb_build/main.pm') 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{!/^#/} ; + 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); -- cgit