Simplify argument handling.

(This used to be commit f305c443db8e48efa80eeda8f83073b475dc3fee)

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 81c3363cfbfcfd0ccfb014a594ffe7a373600e3c..56ad0c87c936c2f241042a921173f4c1a87bc917 100644 (file)
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -96,14 +96,11 @@ use vars qw(@parsed_files);
 
 @parsed_files = ();
 
-sub _read_config_file
+sub _read_config_file($$$)
 {
-       use File::Basename;
        use Cwd;
 
-       my $srcdir = shift;
-       my $builddir = shift;
-       my $filename = shift;
+       my ($srcdir, $builddir, $filename) = @_;
        my @dirlist;
 
        # We need to change our working directory because config.mk files can

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index d6476c0cf23d38f31e9d5946c31dfd3298445eb5..ab889b0e5a8195752a8b273a5e78878b1d731ee9 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -17,7 +17,7 @@ use strict;
 my $output_file = "data.mk";
 
 my $result = GetOptions (
-       'output' => \$output_file);
+       'output=s' => \$output_file);
 
 if (not $result) {
        exit(1);