Author: jpeach Date: 2007-04-02 17:06:14 +0000 (Mon, 02 Apr 2007) New Revision: 22029
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22029 Log: Make sure we respect $srcdir correctly for the srcdir != builddir case. Modified: branches/SAMBA_4_0/source/lib/registry/config.mk branches/SAMBA_4_0/source/lib/replace/samba.m4 branches/SAMBA_4_0/source/main.mk branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm Changeset: Modified: branches/SAMBA_4_0/source/lib/registry/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/registry/config.mk 2007-04-02 17:03:30 UTC (rev 22028) +++ branches/SAMBA_4_0/source/lib/registry/config.mk 2007-04-02 17:06:14 UTC (rev 22029) @@ -20,7 +20,7 @@ $(srcdir)/lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c lib/registry/tdr_regf.h: lib/registry/tdr_regf.c lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl - @CPP="$(CPP)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \ + @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \ --header --outputdir=lib/registry \ --tdr-parser -- $(srcdir)/lib/registry/regf.idl Modified: branches/SAMBA_4_0/source/lib/replace/samba.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/samba.m4 2007-04-02 17:03:30 UTC (rev 22028) +++ branches/SAMBA_4_0/source/lib/replace/samba.m4 2007-04-02 17:06:14 UTC (rev 22029) @@ -3,8 +3,16 @@ SMB_EXT_LIB(LIBREPLACE_EXT, [${LIBDL}]) SMB_ENABLE(LIBREPLACE_EXT) +# remove leading ./ LIBREPLACE_DIR=`echo ${libreplacedir} |sed -e 's/^\.\///g'` +# remove leading srcdir .. we are looking for the relative +# path within the samba source tree or wherever libreplace is. +# We need to make sure the object is not forced to end up in +# the source directory because we might be using a separate +# build directory. +LIBREPLACE_DIR=`echo ${LIBREPLACE_DIR} | sed -e "s|^$srcdir/||g"` + LIBREPLACE_OBJS="" for obj in ${LIBREPLACEOBJ}; do LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}" Modified: branches/SAMBA_4_0/source/main.mk =================================================================== --- branches/SAMBA_4_0/source/main.mk 2007-04-02 17:03:30 UTC (rev 22028) +++ branches/SAMBA_4_0/source/main.mk 2007-04-02 17:06:14 UTC (rev 22029) @@ -283,7 +283,11 @@ check:: test -SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} --builddir=$(builddir) --srcdir=$(srcdir) --expected-failures=samba4-knownfail --skip=samba4-skip $(TEST_OPTIONS) +SELFTEST = $(srcdir)/script/tests/selftest.pl --prefix=${selftest_prefix} \ + --builddir=$(builddir) --srcdir=$(srcdir) \ + --expected-failures=$(srcdir)/samba4-knownfail \ + --skip=$(srcdir)/samba4-skip \ + $(TEST_OPTIONS) test: all libraries $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) --immediate Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm 2007-04-02 17:03:30 UTC (rev 22028) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm 2007-04-02 17:06:14 UTC (rev 22029) @@ -18,8 +18,10 @@ sub is_intree() { - return 4 if (-f "kdc/kdc.c"); - return 3 if (-f "include/smb.h"); + my $srcdir = $ENV{srcdir}; + $srcdir = $srcdir ? "$srcdir/" : ""; + return 4 if (-f "${srcdir}kdc/kdc.c"); + return 3 if (-f "${srcdir}include/smb.h"); return 0; }
