s3-waf: fix LOCALEDIR usage.

Guenther

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index 7382516e3e60ad9896a757153b1fb7958080fab0..d04fe3d30b8ac9d51aeace2442b84f7e35e06bb0 100644 (file)
--- 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 2cbcbe6de1c00537d1f26b062d26ce22dec41c4d..3b0c66a9f4b38af9f322f9c0f0198beffdbe063f 100644 (file)
--- 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'''