From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Wed, 15 Jul 2009 06:52:19 +0000 (+0400)
Subject: [build] Don't install schema files without gconf
X-Git-Tag: EVINCE_2_27_90~29
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=5b96694056a9bfbbeca84a44dfbe9eb82d684e10;p=evince.git

[build] Don't install schema files without gconf

Fixes issue with schema files installed into root folder
---

diff --git a/data/Makefile.am b/data/Makefile.am
index 4d54847d..22ecc667 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 adc5bd4d..b974b4f4 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)