summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/config_mk.pm1
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 49b93a5d98..46b8bf76de 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -46,6 +46,7 @@ use vars qw(@parsed_files);
# which should be parsed
sub run_config_mk($$)
{
+ sub run_config_mk($$);
my ($input, $filename) = @_;
my $result;
my $linenum = -1;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index f9e481a77a..493cc1736a 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -155,6 +155,8 @@ sub _prepare_binaries($)
next unless defined $_->{OUTPUT_TYPE};
next unless ($_->{OUTPUT_TYPE} eq "BINARY");
+ next unless defined($_->{INSTALLDIR});
+
push(@sbn_list, $_->{OUTPUT}) if ($_->{INSTALLDIR} eq "SBINDIR");
push(@bbn_list, $_->{OUTPUT}) if ($_->{INSTALLDIR} eq "BINDIR");
}