Author: jelmer Date: 2005-10-21 20:40:58 +0000 (Fri, 21 Oct 2005) New Revision: 11249
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11249 Log: More OpenBSD make fixes... Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/build/smb_build/output.pm branches/SAMBA_4_0/source/lib/registry/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-10-21 19:31:36 UTC (rev 11248) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-10-21 20:40:58 UTC (rev 11249) @@ -182,7 +182,10 @@ 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([EMAIL PROTECTED]); Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/output.pm 2005-10-21 19:31:36 UTC (rev 11248) +++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2005-10-21 20:40:58 UTC (rev 11249) @@ -14,6 +14,8 @@ { my ($dir,$files) = @_; my @ret = (); + + $dir =~ s/^\.\///g; foreach (@$files) { $_ = "$dir/$_"; Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2005-10-21 19:31:36 UTC (rev 11248) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2005-10-21 20:40:58 UTC (rev 11249) @@ -16,8 +16,8 @@ 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 ################################################
