summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-09-23 01:32:43 -0700
committerGünther Deschner <gd@samba.org>2010-09-23 01:32:43 -0700
commitde49623d4b3bc577694b1601dcdb2eb413692389 (patch)
tree5c28879215496d1e6670289252a19be7971e19bd
parent031dd8cc623a315e8776faae687b53d126ecb700 (diff)
downloadsamba-de49623d4b3bc577694b1601dcdb2eb413692389.tar.gz
samba-de49623d4b3bc577694b1601dcdb2eb413692389.tar.bz2
samba-de49623d4b3bc577694b1601dcdb2eb413692389.zip
s3-waf: fix LOCALEDIR usage.
Guenther
-rw-r--r--source3/build/dynconfig.py2
-rw-r--r--source3/build/wscript3
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index 7382516e3e..d04fe3d30b 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -11,7 +11,6 @@ dir_options = {
'with-codepagedir' : [ '${PREFIX}/lib/samba', 'where to put codepages' ],
'with-privatedir' : [ '${PREFIX}/private', 'where to put smbpasswd' ],
'with-cachedir' : [ '${PREFIX}/var/locks', 'where to put temporary cache files' ],
- 'with-localedir' : [ '${PREFIX}/share/locale', 'Where to put po files' ]
}
# list of cflags to use for dynconfig.c
@@ -38,7 +37,6 @@ dyn_cflags = {
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
'CODEPAGEDIR' : '${CODEPAGEDIR}',
'CACHEDIR' : '${CACHEDIR}',
- 'LOCALEDIR' : '${LOCALEDIR}',
'SMB_PASSWD_FILE' : '${PRIVATEDIR}/smbpasswd',
}
diff --git a/source3/build/wscript b/source3/build/wscript
index 2cbcbe6de1..3b0c66a9f4 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -45,7 +45,8 @@ def build(bld):
cflags=cflags)
bld.SAMBA_SUBSYSTEM('LOCALE_DIR',
'../localedir.c',
- cflags=cflags)
+ cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
+
def dynconfig_cflags(bld):
'''work out the extra CFLAGS for dynconfig.c'''