summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2016-01-11 16:35:30 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2016-01-11 21:11:10 +0100
commit7c804cd796ae05034b3c0f81dfd3eff8d58b9bbf (patch)
treec89a1d446dc708b460145be34c80e1baf9d75022
parentea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (diff)
downloadmpv-7c804cd796ae05034b3c0f81dfd3eff8d58b9bbf.tar.bz2
mpv-7c804cd796ae05034b3c0f81dfd3eff8d58b9bbf.tar.xz
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
-rw-r--r--waftools/generators/headers.py2
-rw-r--r--wscript2
2 files changed, 3 insertions, 1 deletions
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):