From 7c804cd796ae05034b3c0f81dfd3eff8d58b9bbf Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 11 Jan 2016 16:35:30 +0100 Subject: build: add option to customize config files system path Some packagers need to install default config files to some path but automatically load system configuration files from another path. See #2704 --- waftools/generators/headers.py | 2 +- wscript | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py index 3c83292f7e..84f914c2c1 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -27,7 +27,7 @@ def __get_features_string__(ctx): def __add_mpv_defines__(ctx): from sys import argv ctx.define("CONFIGURATION", " ".join(argv)) - ctx.define("MPV_CONFDIR", ctx.env.CONFDIR) + ctx.define("MPV_CONFDIR", ctx.env.CONFLOADDIR) ctx.define("FULLCONFIG", __escape_c_string(__get_features_string__(ctx))) def configure(ctx): diff --git a/wscript b/wscript index 837f5dd62c..8d15f383f3 100644 --- a/wscript +++ b/wscript @@ -872,6 +872,8 @@ _INSTALL_DIRS_LIST = [ ('mandir', '${DATADIR}/man', 'man pages '), ('docdir', '${DATADIR}/doc/mpv', 'documentation files'), ('zshdir', '${DATADIR}/zsh/site-functions', 'zsh completion functions'), + + ('confloaddir', '${CONFDIR}', 'configuration files load directory'), ] def options(opt): -- cgit v1.2.3