[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 4d54847d38b670175da898eef942417b2aa48271..22ecc66732c6d2a6993f90ceed9c5673a2d8c10a 100644 (file)
--- 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 adc5bd4d946f2fa83c6dc6a62287cbb019bb9281..b974b4f446b136319a82efad4b5a8a5f0e128a67 100644 (file)
--- 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)