diff options
| author | Volker Lendecke <vl@samba.org> | 2021-02-02 16:50:48 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-04-01 19:32:36 +0000 |
| commit | 4e174b5a0f42b042f363640d6b02ef6ba4e9883a (patch) | |
| tree | 075569ab7473dcaeb1ae47dc1b31042f515c4d58 /dynconfig | |
| parent | 206c99f6e5e0720eff4e3240d61a51ba151204f7 (diff) | |
| download | samba-4e174b5a0f42b042f363640d6b02ef6ba4e9883a.tar.gz | |
dynconfig: Introduce and expose SAMBA_LIBEXECDIR
Right now the smbspool_krb5_wrapper lives there, but we'll have more
in the future.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'dynconfig')
| -rw-r--r-- | dynconfig/dynconfig.c | 1 | ||||
| -rw-r--r-- | dynconfig/dynconfig.h | 1 | ||||
| -rw-r--r-- | dynconfig/wscript | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c index dd4de16e1d4..415ccc53c52 100644 --- a/dynconfig/dynconfig.c +++ b/dynconfig/dynconfig.c @@ -87,6 +87,7 @@ DEFINE_DYN_CONFIG_PARAM(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ DEFINE_DYN_CONFIG_PARAM(CODEPAGEDIR) DEFINE_DYN_CONFIG_PARAM(LIBDIR) DEFINE_DYN_CONFIG_PARAM(MODULESDIR) +DEFINE_DYN_CONFIG_PARAM(SAMBA_LIBEXECDIR) DEFINE_DYN_CONFIG_PARAM(SHLIBEXT) DEFINE_DYN_CONFIG_PARAM(LOCKDIR) DEFINE_DYN_CONFIG_PARAM(STATEDIR) /** Persistent state files. Default LOCKDIR */ diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h index 156e63e38ac..72028a8c2e1 100644 --- a/dynconfig/dynconfig.h +++ b/dynconfig/dynconfig.h @@ -38,6 +38,7 @@ DEFINE_DYN_CONFIG_PROTO(LMHOSTSFILE) /** Statically configured LanMan hosts. **/ DEFINE_DYN_CONFIG_PROTO(CODEPAGEDIR) DEFINE_DYN_CONFIG_PROTO(LIBDIR) DEFINE_DYN_CONFIG_PROTO(MODULESDIR) +DEFINE_DYN_CONFIG_PROTO(SAMBA_LIBEXECDIR) DEFINE_DYN_CONFIG_PROTO(SHLIBEXT) DEFINE_DYN_CONFIG_PROTO(LOCKDIR) DEFINE_DYN_CONFIG_PROTO(STATEDIR) /** Persistent state files. Default LOCKDIR */ diff --git a/dynconfig/wscript b/dynconfig/wscript index f455699f062..c62afa25399 100644 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -95,6 +95,11 @@ dynconfig = { 'FHS-PATH': '${LIBEXECDIR}', 'OVERWRITE': True, }, + 'SAMBA_LIBEXECDIR' : { + 'STD-PATH': '${LIBEXECDIR}/samba', + 'FHS-PATH': '${LIBEXECDIR}/samba', + 'OVERWRITE': True, + }, 'DATADIR' : { 'STD-PATH': '${DATADIR}', 'FHS-PATH': '${DATADIR}', @@ -373,6 +378,8 @@ def get_override(bld): 'PYTHONARCHDIR' : 'bin/python', 'BINDIR' : 'bin', 'SBINDIR' : 'bin', + 'LIBEXECDIR' : 'bin', + 'SAMBA_LIBEXECDIR' : 'bin', 'CODEPAGEDIR' : 'codepages', 'SCRIPTSBINDIR' : 'source4/scripting/bin', 'SETUPDIR' : 'source4/setup' |