[evolution] Actually respect the --disable-schemas-install configure option
- From: Fridrich Strba <strba src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Actually respect the --disable-schemas-install configure option
- Date: Mon, 15 Mar 2010 14:00:16 +0000 (UTC)
commit c4cde2306609d73824608f216c2c29726602b8a7
Author: Fridrich Strba <fridrich strba bluewin ch>
Date: Mon Mar 15 14:51:13 2010 +0100
Actually respect the --disable-schemas-install configure option
calendar/gui/Makefile.am | 4 ++++
mail/Makefile.am | 4 ++++
modules/addressbook/Makefile.am | 4 ++++
plugins/attachment-reminder/Makefile.am | 4 ++++
plugins/bogo-junk-plugin/Makefile.am | 4 ++++
plugins/default-mailer/Makefile.am | 4 ++++
plugins/email-custom-header/Makefile.am | 4 ++++
plugins/external-editor/Makefile.am | 4 ++++
plugins/face/Makefile.am | 4 ++++
plugins/mail-notification/Makefile.am | 4 ++++
plugins/templates/Makefile.am | 4 ++++
shell/Makefile.am | 4 ++++
12 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index ba6d56d..71ba72a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -256,6 +256,8 @@ CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)"; then \
@@ -274,6 +276,8 @@ install-data-local:
fi
endif
+endif
+
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c802528..344913b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -230,6 +230,8 @@ schema_in_files = evolution-mail.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -249,6 +251,8 @@ install-data-local:
fi
endif
+endif
+
# Prologue
dist-hook:
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 641cd45..24131a4 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -91,6 +91,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -109,6 +111,8 @@ install-data-local:
fi
endif
+endif
+
ui_DATA = \
ldap-config.ui
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 2a55642..684d1d2 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -39,6 +39,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -59,6 +61,8 @@ install-data-local:
fi
endif
+endif
+
EXTRA_DIST = org-gnome-evolution-attachment-reminder.eplug.xml \
org-gnome-attachment-reminder.error.xml \
$(schema_in_files)
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index e4c03ae..935fc31 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -27,6 +27,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
@@ -34,6 +36,8 @@ install-data-local:
done \
fi
+endif
+
BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index a3b85d1..b4132fd 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -27,6 +27,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -47,6 +49,8 @@ install-data-local:
fi
endif
+endif
+
EXTRA_DIST = \
org-gnome-default-mailer.eplug.xml \
org-gnome-default-mailer.error.xml \
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index def545a..9778980 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -37,6 +37,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -57,6 +59,8 @@ install-data-local:
fi
endif
+endif
+
ui_DATA = \
org-gnome-email-custom-header.ui
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 0f4cec9..c36ce82 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -54,6 +54,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
@@ -61,6 +63,8 @@ install-data-local:
done \
fi
+endif
+
EXTRA_DIST = \
org-gnome-external-editor.eplug.xml \
org-gnome-external-editor.error.xml \
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 8bac8fa..29c181c 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -53,6 +53,8 @@ CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(schema_DATA)
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)"; then \
@@ -71,4 +73,6 @@ install-data-local:
fi
endif
+endif
+
-include $(top_srcdir)/git.mk
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 1a7e81e..e70dca5 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -41,6 +41,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -61,6 +63,8 @@ install-data-local:
fi
endif
+endif
+
BUILT_SOURCES = $(plugin_DATA)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index c694ac8..9104b3e 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -33,6 +33,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -53,6 +55,8 @@ install-data-local:
fi
endif
+endif
+
EXTRA_DIST = org-gnome-templates.eplug.xml \
$(schema_in_files)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 26a54eb..8afc886 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -179,6 +179,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
+if GCONF_SCHEMAS_INSTALL
+
if OS_WIN32
install-data-local:
if test -z "$(DESTDIR)" ; then \
@@ -199,6 +201,8 @@ install-data-local:
fi
endif
+endif
+
# Extra dist stuff
EXTRA_DIST = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]