mirror of https://gitlab.com/ita1024/waf.git
glib2: consider destdir when compiling schemas
When a destdir is set, the schemas are now not only installed below it, but also compiled there.
This commit is contained in:
parent
ec3bf9d046
commit
f0c5c732a7
|
@ -303,8 +303,13 @@ def process_settings(self):
|
||||||
def compile_schemas_callback(bld):
|
def compile_schemas_callback(bld):
|
||||||
if not bld.is_install: return
|
if not bld.is_install: return
|
||||||
Logs.pprint ('YELLOW','Updating GSettings schema cache')
|
Logs.pprint ('YELLOW','Updating GSettings schema cache')
|
||||||
command = Utils.subst_vars("${GLIB_COMPILE_SCHEMAS} ${GSETTINGSSCHEMADIR}", bld.env)
|
env = bld.env
|
||||||
self.bld.exec_command(command)
|
destdir = Options.options.destdir
|
||||||
|
if destdir:
|
||||||
|
path = os.path.join(destdir, env.GSETTINGSSCHEMADIR.lstrip(os.sep))
|
||||||
|
else:
|
||||||
|
path = env.GSETTINGSSCHEMADIR
|
||||||
|
self.bld.exec_command("%s %s" % (env.get_flat('GLIB_COMPILE_SCHEMAS'), path))
|
||||||
|
|
||||||
if self.bld.is_install:
|
if self.bld.is_install:
|
||||||
if not self.env.GSETTINGSSCHEMADIR:
|
if not self.env.GSETTINGSSCHEMADIR:
|
||||||
|
|
Loading…
Reference in New Issue