summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-21 20:40:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:08 -0500
commitfff24f9ebde4c605f9cb390ed5ef939801a25cfa (patch)
tree0fc710debb65b48d6e76379a61f7d14795e60b58 /source4/build
parentdf30ef140d24863b849eaa81624509fabd663ee7 (diff)
downloadsamba-fff24f9ebde4c605f9cb390ed5ef939801a25cfa.tar.gz
samba-fff24f9ebde4c605f9cb390ed5ef939801a25cfa.tar.bz2
samba-fff24f9ebde4c605f9cb390ed5ef939801a25cfa.zip
r11249: More OpenBSD make fixes...
(This used to be commit 118e3bc507b2694f7e5ea191950626931d8ebf29)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm5
-rw-r--r--source4/build/smb_build/output.pm2
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 06f98446bb..6f0cf6e189 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -182,7 +182,10 @@ sub _prepare_manpages($)
my @mp_list = ();
foreach (values %$ctx) {
- push (@mp_list, "$_->{BASEDIR}/$_->{MANPAGE}") if (defined($_->{MANPAGE}) and $_->{MANPAGE} ne "");
+ my $dir = $_->{BASEDIR};
+ next unless defined($dir);
+ $dir =~ s/^\.\///g;
+ push (@mp_list, "$dir/$_->{MANPAGE}") if (defined($_->{MANPAGE}) and $_->{MANPAGE} ne "");
}
my $mp = array2oneperline(\@mp_list);
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 46e8ffb0c5..309a027947 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -14,6 +14,8 @@ sub add_dir($$)
{
my ($dir,$files) = @_;
my @ret = ();
+
+ $dir =~ s/^\.\///g;
foreach (@$files) {
$_ = "$dir/$_";