summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/pimlico/contacts/contacts-conditionally-install-schema.patch
diff options
context:
space:
mode:
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.patch37
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 @@
1Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
2
3If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
4be installed.
5
6Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
7
8Upstream-Status: Pending
9---
10 data/Makefile.am | 7 ++++---
11 1 files changed, 4 insertions(+), 3 deletions(-)
12
13diff --git a/data/Makefile.am b/data/Makefile.am
14index 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--
361.7.7.6
37