From afc90321ecd47ec1a8b6196c9b4aa15c2c654d41 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 10 May 2019 18:49:20 +0200 Subject: [PATCH] build: add SAMBA_DATADIR as "samba" subdirectory of DATADIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 : 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 Reviewed-by: Noel Power --- buildtools/wafsamba/samba_patterns.py | 2 ++ docs-xml/smbdotconf/generate-file-list.sh | 1 + dynconfig/dynconfig.c | 1 + dynconfig/dynconfig.h | 1 + dynconfig/wscript | 5 +++++ 5 files changed, 10 insertions(+) diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index d0fe965c730..43422a71f99 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -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,\" LMHOSTSFILE: %s\\n\",get_dyn_LMHOSTSFILE());\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,\" SHLIBEXT: %s\\n\",get_dyn_SHLIBEXT());\n") fp.write(" output(screen,\" LOCKDIR: %s\\n\",get_dyn_LOCKDIR());\n") diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh index 7ab1b7caf76..a86bac5c289 100755 --- a/docs-xml/smbdotconf/generate-file-list.sh +++ b/docs-xml/smbdotconf/generate-file-list.sh @@ -17,6 +17,7 @@ echo " + ]>" DIR=. diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c index e70a10f8cfe..dd4de16e1d4 100644 --- a/dynconfig/dynconfig.c +++ b/dynconfig/dynconfig.c @@ -99,6 +99,7 @@ DEFINE_DYN_CONFIG_PARAM(BINDDNS_DIR) DEFINE_DYN_CONFIG_PARAM(LOCALEDIR) DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR) DEFINE_DYN_CONFIG_PARAM(DATADIR) +DEFINE_DYN_CONFIG_PARAM(SAMBA_DATADIR) DEFINE_DYN_CONFIG_PARAM(SETUPDIR) DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */ DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR) diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h index bdab2e8f242..156e63e38ac 100644 --- a/dynconfig/dynconfig.h +++ b/dynconfig/dynconfig.h @@ -50,6 +50,7 @@ DEFINE_DYN_CONFIG_PROTO(BINDDNS_DIR) DEFINE_DYN_CONFIG_PROTO(LOCALEDIR) DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR) DEFINE_DYN_CONFIG_PROTO(DATADIR) +DEFINE_DYN_CONFIG_PROTO(SAMBA_DATADIR) DEFINE_DYN_CONFIG_PROTO(SETUPDIR) DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR) DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR) diff --git a/dynconfig/wscript b/dynconfig/wscript index e352712d284..5a0ce6d956a 100644 --- a/dynconfig/wscript +++ b/dynconfig/wscript @@ -100,6 +100,11 @@ dynconfig = { 'FHS-PATH': '${DATADIR}', 'OVERWRITE': True, }, + 'SAMBA_DATADIR' : { + 'STD-PATH': '${DATADIR}/samba', + 'FHS-PATH': '${DATADIR}/samba', + 'OVERWRITE': True, + }, 'LOCALEDIR' : { 'STD-PATH': '${LOCALEDIR}', 'FHS-PATH': '${LOCALEDIR}',