Kaydet (Commit) 47bca2f0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't worry if there is no distro-configs/Foo.conf

The --with-distro options might come from bin/build-ooo in a "build"
style build, and in that case, the relevant configure options are
already on the command line, too.
üst 45f8c190
...@@ -44,8 +44,8 @@ sub read_args($) ...@@ -44,8 +44,8 @@ sub read_args($)
sub invalid_distro($$) sub invalid_distro($$)
{ {
my ($config, $distro) = @_; my ($config, $distro) = @_;
print STDERR "can't find distro option set: $config\n"; print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n";
print STDERR "valid values are:\n"; print STDERR "Distros with distro option sets are:\n";
my $dirh; my $dirh;
opendir ($dirh, "distro-configs"); opendir ($dirh, "distro-configs");
while (($_ = readdir ($dirh))) { while (($_ = readdir ($dirh))) {
...@@ -53,7 +53,6 @@ sub invalid_distro($$) ...@@ -53,7 +53,6 @@ sub invalid_distro($$)
print STDERR "\t$1\n"; print STDERR "\t$1\n";
} }
closedir ($dirh); closedir ($dirh);
exit (1);
} }
my @cmdline_args = (); my @cmdline_args = ();
...@@ -72,8 +71,9 @@ for my $arg (@cmdline_args) { ...@@ -72,8 +71,9 @@ for my $arg (@cmdline_args) {
my $config = "distro-configs/$1.conf"; my $config = "distro-configs/$1.conf";
if (! -f $config) { if (! -f $config) {
invalid_distro ($config, $1); invalid_distro ($config, $1);
} } else {
push @args, read_args ($config); push @args, read_args ($config);
}
} else { } else {
push @args, $arg; push @args, $arg;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment