mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
build: add SAMBA_DATADIR as "samba" subdirectory of DATADIR
DATADIR should have been set to this path from the beginning, too late to change that now as ut's used as parent for two other directory varialbles: SETUPDIR and CODEPAGEDIR. From <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>: datadir The directory for installing idiosyncratic read-only architecture-independent data files for this program. This is usually the same place as ‘datarootdir’, but we use the two separate variables so that you can move these program-specific files without altering the location for Info files, man pages, etc. This should normally be /usr/local/share, but write it as $(datarootdir). (If you are using Autoconf, write it as ‘@datadir@’.) The definition of ‘datadir’ is the same for all packages, so you should install your data in a subdirectory thereof. Most packages install their data under $(datadir)/package-name/. Currently Samba doesn't install any application specific data files, but I'm going to do just that in a subsequent commit. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Noel Power <noel.power@suse.com>
This commit is contained in:
parent
213ca6e4cc
commit
afc90321ec
@ -101,6 +101,8 @@ def write_build_options_header(fp):
|
|||||||
fp.write(" output(screen,\" LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());\n")
|
fp.write(" output(screen,\" LOGFILEBASE: %s\\n\", get_dyn_LOGFILEBASE());\n")
|
||||||
fp.write(" output(screen,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());\n")
|
fp.write(" output(screen,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());\n")
|
||||||
fp.write(" output(screen,\" LIBDIR: %s\\n\",get_dyn_LIBDIR());\n")
|
fp.write(" output(screen,\" LIBDIR: %s\\n\",get_dyn_LIBDIR());\n")
|
||||||
|
fp.write(" output(screen,\" DATADIR: %s\\n\",get_dyn_DATADIR());\n")
|
||||||
|
fp.write(" output(screen,\" SAMBA_DATADIR: %s\\n\",get_dyn_SAMBA_DATADIR());\n")
|
||||||
fp.write(" output(screen,\" MODULESDIR: %s\\n\",get_dyn_MODULESDIR());\n")
|
fp.write(" output(screen,\" MODULESDIR: %s\\n\",get_dyn_MODULESDIR());\n")
|
||||||
fp.write(" output(screen,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());\n")
|
fp.write(" output(screen,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());\n")
|
||||||
fp.write(" output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());\n")
|
fp.write(" output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());\n")
|
||||||
|
@ -17,6 +17,7 @@ echo "<!DOCTYPE section [
|
|||||||
<!ENTITY pathconfig.CACHEDIR '\${prefix}/var/cache'>
|
<!ENTITY pathconfig.CACHEDIR '\${prefix}/var/cache'>
|
||||||
<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
|
<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
|
||||||
<!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'>
|
<!ENTITY pathconfig.MITKDCPATH '\${prefix}/sbin/krb5kdc'>
|
||||||
|
<!ENTITY pathconfig.SAMBA_DATADIR '\${prefix}/var/samba'>
|
||||||
]>"
|
]>"
|
||||||
|
|
||||||
DIR=.
|
DIR=.
|
||||||
|
@ -99,6 +99,7 @@ DEFINE_DYN_CONFIG_PARAM(BINDDNS_DIR)
|
|||||||
DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
|
DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
|
||||||
DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
|
DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
|
||||||
DEFINE_DYN_CONFIG_PARAM(DATADIR)
|
DEFINE_DYN_CONFIG_PARAM(DATADIR)
|
||||||
|
DEFINE_DYN_CONFIG_PARAM(SAMBA_DATADIR)
|
||||||
DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
|
DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
|
||||||
DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
|
DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
|
||||||
DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
|
DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
|
||||||
|
@ -50,6 +50,7 @@ DEFINE_DYN_CONFIG_PROTO(BINDDNS_DIR)
|
|||||||
DEFINE_DYN_CONFIG_PROTO(LOCALEDIR)
|
DEFINE_DYN_CONFIG_PROTO(LOCALEDIR)
|
||||||
DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR)
|
DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR)
|
||||||
DEFINE_DYN_CONFIG_PROTO(DATADIR)
|
DEFINE_DYN_CONFIG_PROTO(DATADIR)
|
||||||
|
DEFINE_DYN_CONFIG_PROTO(SAMBA_DATADIR)
|
||||||
DEFINE_DYN_CONFIG_PROTO(SETUPDIR)
|
DEFINE_DYN_CONFIG_PROTO(SETUPDIR)
|
||||||
DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
|
DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
|
||||||
DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
|
DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
|
||||||
|
@ -100,6 +100,11 @@ dynconfig = {
|
|||||||
'FHS-PATH': '${DATADIR}',
|
'FHS-PATH': '${DATADIR}',
|
||||||
'OVERWRITE': True,
|
'OVERWRITE': True,
|
||||||
},
|
},
|
||||||
|
'SAMBA_DATADIR' : {
|
||||||
|
'STD-PATH': '${DATADIR}/samba',
|
||||||
|
'FHS-PATH': '${DATADIR}/samba',
|
||||||
|
'OVERWRITE': True,
|
||||||
|
},
|
||||||
'LOCALEDIR' : {
|
'LOCALEDIR' : {
|
||||||
'STD-PATH': '${LOCALEDIR}',
|
'STD-PATH': '${LOCALEDIR}',
|
||||||
'FHS-PATH': '${LOCALEDIR}',
|
'FHS-PATH': '${LOCALEDIR}',
|
||||||
|
Loading…
Reference in New Issue
Block a user