[evince] [build] Don't install schema files without gconf
- From: Nickolay V. Shmyrev <nshmyrev src gnome org>
- To: svn-commits-list gnome org
- Subject: [evince] [build] Don't install schema files without gconf
- Date: Wed, 15 Jul 2009 06:54:57 +0000 (UTC)
commit 5b96694056a9bfbbeca84a44dfbe9eb82d684e10
Author: Nickolay V. Shmyrev <nshmyrev yandex ru>
Date: Wed Jul 15 10:52:19 2009 +0400
[build] Don't install schema files without gconf
Fixes issue with schema files installed into root folder
data/Makefile.am | 8 ++++++++
thumbnailer/Makefile.am | 6 +++++-
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 4d54847..22ecc66 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,6 +41,7 @@ desktop_DATA = $(DESKTOP_FILES)
# GConf schema
#
+if WITH_GCONF
@INTLTOOL_SCHEMAS_RULE@
schema_in_files = evince.schemas.in
@@ -71,6 +72,13 @@ if GCONF_SCHEMAS_INSTALL
fi
endif
+else
+
+install-schemas:
+uninstall-schemas:
+
+endif
+
#
# GTK icon cache
#
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index adc5bd4..b974b4f 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -1,4 +1,3 @@
- INTLTOOL_SCHEMAS_RULE@
bin_PROGRAMS = evince-thumbnailer
@@ -36,6 +35,10 @@ schema_files = \
evince-thumbnailer-ps.schemas.in \
evince-thumbnailer.schemas.in
+if WITH_GCONF
+
+ INTLTOOL_SCHEMAS_RULE@
+
schema_DATA =
if ENABLE_PDF
@@ -68,6 +71,7 @@ if GCONF_SCHEMAS_INSTALL
done \
fi
endif
+endif
EXTRA_DIST = \
$(schema_files)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]