summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-18 18:33:24 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-18 18:33:24 +0200
commit65f365d2ecccc5f0a1fb7c5140e5eade74ac9f08 (patch)
tree95e1edd42a6c23179b93de37370eae7646633fdd
parent10676780486c6b7fcf5b11240bc8c2726f58fff2 (diff)
downloadsamba-65f365d2ecccc5f0a1fb7c5140e5eade74ac9f08.tar.gz
samba-65f365d2ecccc5f0a1fb7c5140e5eade74ac9f08.tar.bz2
samba-65f365d2ecccc5f0a1fb7c5140e5eade74ac9f08.zip
Simplify argument handling.
(This used to be commit f305c443db8e48efa80eeda8f83073b475dc3fee)
-rw-r--r--source4/build/smb_build/config_mk.pm7
-rw-r--r--source4/build/smb_build/main.pl2
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 81c3363cfb..56ad0c87c9 100644
--- 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 d6476c0cf2..ab889b0e5a 100644
--- 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);