summaryrefslogtreecommitdiff
path: root/source3/build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-13 15:13:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-13 15:51:52 +1000
commitd309499b9e268bff5e366a9986528f0accbc02b3 (patch)
tree89f28cfdc5e4a67980cef1bd9bb64a943018f2db /source3/build
parent887fdb7ba126f280682699d19bcc2931e9c3602d (diff)
downloadsamba-d309499b9e268bff5e366a9986528f0accbc02b3.tar.gz
samba-d309499b9e268bff5e366a9986528f0accbc02b3.tar.bz2
samba-d309499b9e268bff5e366a9986528f0accbc02b3.zip
s3-build Remove distinct LOCALEDIR subsystem
This is no different to the rest of dynconfig, and so should be dealt with there. Andrew Bartlett
Diffstat (limited to 'source3/build')
-rw-r--r--source3/build/dynconfig.py1
-rw-r--r--source3/build/wscript3
2 files changed, 1 insertions, 3 deletions
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):