Fix merged build.

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 0a75ba72e65fcd32241bec7851c3aa07f479121e..19d3cc141be4d4a893d6129ced7ca78ac36cee62 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -31,7 +31,7 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               SMB_INCLUDE_MK(lib/talloc/config.mk)
+               SMB_INCLUDE_MK(../talloc/config.mk)
        ]
 )
 

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 45089dfaeaae63e1bf4e15f9dc1ef957010c3926..d8cf4570047e749a3004084ebfe9267b591b6788 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -81,8 +81,8 @@ libmessagingsrcdir := $(samba4srcdir)/lib/messaging
 libeventssrcdir := $(samba4srcdir)/lib/events
 libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline
 poptsrcdir := $(samba4srcdir)/../popt
-socketwrappersrcdir := $(samba4srcdir)/lib/socket_wrapper
-nsswrappersrcdir := $(samba4srcdir)/lib/nss_wrapper
+socketwrappersrcdir := $(samba4srcdir)/../socket_wrapper
+nsswrappersrcdir := $(samba4srcdir)/../nss_wrapper
 appwebsrcdir := $(samba4srcdir)/lib/appweb
 libstreamsrcdir := $(samba4srcdir)/lib/stream
 libutilsrcdir := $(samba4srcdir)/lib/util
@@ -113,9 +113,9 @@ pyscriptsrcdir := $(samba4srcdir)/scripting/python
 kdcsrcdir := $(samba4srcdir)/kdc
 smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline
 ntp_signdsrcdir := $(samba4srcdir)/ntp_signd
-tdbsrcdir := $(samba4srcdir)/lib/tdb
-ldbsrcdir := $(samba4srcdir)/lib/ldb
-tallocsrcdir := $(samba4srcdir)/lib/talloc
+tdbsrcdir := $(samba4srcdir)/../tdb
+ldbsrcdir := $(samba4srcdir)/../ldb
+tallocsrcdir := $(samba4srcdir)/../talloc
 override ASN1C = bin/asn1_compile4
 override ET_COMPILER = bin/compile_et4
 include samba4-data.mk