From f36e51617c7bd316f3ef393532bbc169895d6a66 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 21 Oct 2008 18:49:43 +0200
Subject: [PATCH] Don't include a (relative path) srcdir in samba4-data.mk.

---
 source3/Makefile.in | 6 ++++--
 source3/samba4.m4   | 2 +-
 source3/samba4.mk   | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 01255df087f..25c3a590ca3 100644
--- 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 ed49347cb6e..15fffb9e738 100644
--- 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 27fb210beb3..5d1f0d10528 100644
--- 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))
-- 
2.34.1