diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-09 08:46:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 15:26:26 +0100 |
commit | 5e775b5e5c0db6f76546355be22aa029a7cf69fa (patch) | |
tree | 1fb9cbd970702d3495317346b26f844c91934956 /meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch | |
parent | af8e6b6c57dadb3bf7672d063a98d3baa508c7f4 (diff) | |
download | poky-5e775b5e5c0db6f76546355be22aa029a7cf69fa.tar.gz |
pimlico: Remove
Remove the Pimlico applications (Contacts, Dates, Tasks). oe-core isn't a
reference PIM stack, so we don't need this.
(From OE-Core rev: 373895e6c691277e15a09aee3504243448c55b50)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch')
-rw-r--r-- | meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch | 37 |
1 files changed, 0 insertions, 37 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 deleted file mode 100644 index 2ab7882c81..0000000000 --- a/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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 | |||