Don't include a (relative path) srcdir in samba4-data.mk.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 01255df087f94820186f78efd7d6ebf41c9dedec..25c3a590ca3ff1ce535ead2a3cab36b4a1c7409f 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1154,9 +1154,11 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
 ######################################################################
 # now the rules...
 ######################################################################
-all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
+all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
        $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@
 
+basics::
+
 nss_modules:: $(NSS_MODULES)
 
 pam_modules:: $(PAM_MODULES)
@@ -1167,7 +1169,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@
 
 gpext_modules:: $(GPEXT_MODULES)
 
-torture:: SHOWFLAGS $(TORTURE_PROGS) 
+torture:: SHOWFLAGS basics $(TORTURE_PROGS) 
 
 smbtorture : SHOWFLAGS bin/smbtorture@EXEEXT@
 

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index ed49347cb6e61e2e37c7080aecdced66a48757ab..15fffb9e738abd67bbf65050702b65b3934a4ff8 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -125,7 +125,7 @@ m4_include(nsswitch/config.m4)
 dnl Samba 4 files
 AC_SUBST(LD)
 AC_LIBREPLACE_SHLD_FLAGS
-SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS])
+SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
                 
 oldbuilddir="$builddir"
 builddir="$builddir/../source4"

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 27fb210beb3e801e55a98cf2bd6538dd4ae0b7af..5d1f0d105282d98bd54394d75c114ec000019917 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -158,6 +158,6 @@ clean::
 proto:: $(PROTO_HEADERS)
 modules:: $(PLUGINS)
 
-all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
-torture:: basics bin/smbtorture4
-everything:: basics $(patsubst %,%4,$(BINARIES))
+all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4
+torture:: bin/smbtorture4
+everything:: $(patsubst %,%4,$(BINARIES))