summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/smb_build/makefile.pm5
-rw-r--r--source4/build/smb_build/output.pm2
-rw-r--r--source4/lib/registry/config.mk4
3 files changed, 8 insertions, 3 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/$_";
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 7aa720cc7a..9461bb2a95 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -16,8 +16,8 @@ REQUIRED_SUBSYSTEMS = TDR
NOPROTO = YES
INIT_OBJ_FILES = tdr_regf.o
-./lib/registry/reg_backend_nt4.c: ./lib/registry/tdr_regf.c
-./lib/registry/tdr_regf.c: lib/registry/regf.idl
+lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.c: lib/registry/regf.idl
@CPP="$(CPP)" pidl/pidl $(PIDL_ARGS) --header --outputdir=lib/registry --tdr-header --tdr-parser -- lib/registry/regf.idl
################################################