diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-09 15:56:56 +1100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-17 00:57:10 +0100 |
| commit | a759b1a3ca0750cf6637f9541ee1109d14707fd8 (patch) | |
| tree | 870234c74faf92344a3af9ea3605d16f4a12b885 | |
| parent | e1f2442096e626b49e63838b28698965eef52518 (diff) | |
| download | samba-a759b1a3ca0750cf6637f9541ee1109d14707fd8.tar.gz samba-a759b1a3ca0750cf6637f9541ee1109d14707fd8.tar.bz2 samba-a759b1a3ca0750cf6637f9541ee1109d14707fd8.zip | |
s4-build: added LOCALEDIR config option
s3 needs dyn_LOCALEDIR
| -rw-r--r-- | source4/dynconfig/dynconfig.c | 1 | ||||
| -rwxr-xr-x | source4/dynconfig/wscript | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c index 9fbfed0543..228cbbcfa8 100644 --- a/source4/dynconfig/dynconfig.c +++ b/source4/dynconfig/dynconfig.c @@ -84,6 +84,7 @@ DEFINE_DYN_CONFIG_PARAM(PIDDIR) DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR) DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE) DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR) +DEFINE_DYN_CONFIG_PARAM(LOCALEDIR) /* these are not in s3 */ DEFINE_DYN_CONFIG_PARAM(DATADIR) diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index c2741fd875..45f79368f9 100755 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -1,6 +1,6 @@ #!/usr/bin/env python -import string, Utils, Options, sys, Build, os +import string, Utils, Options, sys, Build, os, intltool from samba_utils import EXPAND_VARIABLES, os_path_relpath # list of directory options to offer in configure @@ -26,6 +26,7 @@ dyn_cflags = { 'LOCKDIR' : '${LOCALSTATEDIR}/locks', 'PIDDIR' : '${LOCALSTATEDIR}/run', 'DATADIR' : '${DATADIR}', + 'LOCALEDIR' : '${LOCALEDIR}', 'SETUPDIR' : '${DATADIR}/setup', 'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}', 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}', |