diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-03-27 15:01:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-27 13:26:37 +0100 |
commit | c3c5e8933a0833f31f976aa69ee8d013fc0136ad (patch) | |
tree | a67deea0984fd1cbc9e789e84e2e06f21f131d9e /meta/recipes-sato/pimlico/contacts | |
parent | 21a314e030477c4f82264b18553d4ded832cff62 (diff) | |
download | poky-c3c5e8933a0833f31f976aa69ee8d013fc0136ad.tar.gz |
contacts.inc: conditionally install shema
Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL,
If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
be installed, but it always installed shema before, this was incorrect
and it would cause host contamination since it would read
$HOME/gconf/.gconf.
[YOCTO #2178]
(From OE-Core rev: 674fa286d882ff94830cbf748e3f5abc63a5575a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/pimlico/contacts')
-rw-r--r-- | meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch new file mode 100644 index 0000000000..2ab7882c81 --- /dev/null +++ b/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL | ||
2 | |||
3 | If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not | ||
4 | be installed. | ||
5 | |||
6 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | data/Makefile.am | 7 ++++--- | ||
11 | 1 files changed, 4 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
14 | index f790823..b6fd643 100644 | ||
15 | --- a/data/Makefile.am | ||
16 | +++ b/data/Makefile.am | ||
17 | @@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1 | ||
18 | |||
19 | if HAVE_GCONF | ||
20 | install-data-local: | ||
21 | - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ | ||
22 | + if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \ | ||
23 | + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ | ||
24 | $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \ | ||
25 | (echo ;\ | ||
26 | echo "*****************************************************"; \ | ||
27 | echo "Installation of schemas failed, install them manually"; \ | ||
28 | - echo "*****************************************************";) | ||
29 | - @true | ||
30 | + echo "*****************************************************";); \ | ||
31 | + fi | ||
32 | endif | ||
33 | |||
34 | CLEANFILES = $(desktop_DATA) | ||
35 | -- | ||
36 | 1.7.7.6 | ||
37 | |||