summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-08 20:34:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:37:52 -0500
commit3e941e6a92e273dc8d5bca982870b3a91cbcd521 (patch)
tree82ad2b9b6931ff7ccf7f1ce5bfd134f1bbdd994b
parenta769fa3467e836c6074314d6a67a2a64a96baa9e (diff)
downloadsamba-3e941e6a92e273dc8d5bca982870b3a91cbcd521.tar.gz
samba-3e941e6a92e273dc8d5bca982870b3a91cbcd521.tar.bz2
samba-3e941e6a92e273dc8d5bca982870b3a91cbcd521.zip
r10091: Fix perl warnings
(This used to be commit 045bce900ea0b864bf3ac2fe8c197d42c6d38a91)
-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");
}