From: Jelmer Vernooij Date: Fri, 24 Oct 2008 02:18:47 +0000 (+0200) Subject: Fix merged build paths. X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=9d679c9a67f6dcb1ed1597476c63c8adf3b3f426 Fix merged build paths. --- diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 15fffb9e738..c68057fd35c 100644 --- 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 5d1f0d10528..e08cbfcfece 100644 --- 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