From d309499b9e268bff5e366a9986528f0accbc02b3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 13 Apr 2011 15:13:45 +1000
Subject: s3-build Remove distinct LOCALEDIR subsystem

This is no different to the rest of dynconfig, and so should be dealt
with there.

Andrew Bartlett
---
 source3/build/dynconfig.py | 1 +
 source3/build/wscript      | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'source3/build')

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index f243baa92d..65436b982d 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -30,6 +30,7 @@ dyn_cflags = {
     'CONFIGFILE'                     : '${SYSCONFDIR}/smb.conf',
     'DATADIR'                        : '${DATADIR}',
     'LIBDIR'                         : '${LIBDIR}',
+    'LOCALEDIR'                      : '${LOCALEDIR}',
     'LMHOSTSFILE'                    : '${SYSCONFDIR}/lmhosts',
     'LOCKDIR'                        : '${LOCALSTATEDIR}/locks',
     'LOGFILEBASE'                    : '${LOCALSTATEDIR}',
diff --git a/source3/build/wscript b/source3/build/wscript
index 70219bc10a..d370daf899 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -45,9 +45,6 @@ def build(bld):
                         '../dynconfig.c',
                         deps='replace talloc tdb popt',
                         cflags=cflags)
-    bld.SAMBA3_SUBSYSTEM('LOCALE_DIR',
-                        '../localedir.c',
-                        cflags='-DLOCALEDIR=\"%s\"' % bld.env.LOCALEDIR)
 
 
 def dynconfig_cflags(bld):
-- 
cgit