diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/gconf.bbclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 8ebb5120ed..e9076b2779 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass | |||
@@ -7,6 +7,12 @@ DEPENDS += "gconf gconf-native" | |||
7 | export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults" | 7 | export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults" |
8 | export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2" | 8 | export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2" |
9 | 9 | ||
10 | # Disable install-time schema registration as we're a packaging system so this | ||
11 | # happens in the postinst script, not at install time. Set both the configure | ||
12 | # script option and the traditional envionment variable just to make sure. | ||
13 | EXTRA_OECONF += "--disable-schemas-install" | ||
14 | export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1" | ||
15 | |||
10 | gconf_postinst() { | 16 | gconf_postinst() { |
11 | if [ "x$D" != "x" ]; then | 17 | if [ "x$D" != "x" ]; then |
12 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" | 18 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" |