summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 04:18:47 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 04:18:47 +0200
commit9d679c9a67f6dcb1ed1597476c63c8adf3b3f426 (patch)
tree9121f0d785f17cc26a4ad0187282fdb24787d168 /source3
parente9ab9e52f0bbbf2c9f95b5344db1c7ba305bd59f (diff)
downloadsamba-9d679c9a67f6dcb1ed1597476c63c8adf3b3f426.tar.gz
samba-9d679c9a67f6dcb1ed1597476c63c8adf3b3f426.tar.bz2
samba-9d679c9a67f6dcb1ed1597476c63c8adf3b3f426.zip
Fix merged build paths.
Diffstat (limited to 'source3')
-rw-r--r--source3/samba4.m42
-rw-r--r--source3/samba4.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 15fffb9e73..c68057fd35 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 5d1f0d1052..e08cbfcfec 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