Fix merged build paths.

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 15fffb9e738abd67bbf65050702b65b3934a4ff8..c68057fd35c4faebe81c5e3f5eb3c5ed1ca9c271 100644 (file)
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -33,7 +33,7 @@ m4_include(../lib/util/xattr.m4)
 m4_include(../lib/util/capability.m4)
 m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
-m4_include(lib/charset/config.m4)
+m4_include(../lib/util/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)

diff --git a/source3/samba4.mk b/source3/samba4.mk
index 5d1f0d105282d98bd54394d75c114ec000019917..e08cbfcfecef33034d513c296a5db18df3f2d012 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -73,7 +73,7 @@ authsrcdir := $(samba4srcdir)/auth
 nsswitchsrcdir := $(samba4srcdir)/nsswitch
 libsrcdir := $(samba4srcdir)/lib
 libsocketsrcdir := $(samba4srcdir)/lib/socket
-libcharsetsrcdir := $(samba4srcdir)/lib/charset
+libcharsetsrcdir := $(samba4srcdir)/../lib/util/charset
 ldb_sambasrcdir := $(samba4srcdir)/lib/ldb-samba
 libtlssrcdir := $(samba4srcdir)/lib/tls
 libregistrysrcdir := $(samba4srcdir)/lib/registry