r10091: Fix perl warnings

(This used to be commit 045bce900ea0b864bf3ac2fe8c197d42c6d38a91)

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 49b93a5d980693c54bda998c9ceda522aeb7e658..46b8bf76de463c72dd33908f5379b865f0304929 100644 (file)
--- 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 f9e481a77a8a0b9987abbee31317dbd557ef6b81..493cc1736a16557dca5403a7053f5ea63b00fde3 100644 (file)
--- 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");
        }