From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 20 Jul 2012 20:36:44 +0000 (+0000)
Subject: installation of schema
X-Git-Tag: v0.8.0.5~287
X-Git-Url: https://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=f34e3700b17214bffe3bf115a114be38596089c9;hp=4e7bc75508b67d60a3f12210faff760af326d4bf;p=psensor.git

installation of schema
---

diff --git a/debian/rules b/debian/rules
index b760bee..894206d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 1
 
 %:
 	dh $@ 
diff --git a/src/Makefile.am b/src/Makefile.am
index c3641a3..818040b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,16 +85,16 @@ AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
+schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schema_DATA = psensor.schemas
+
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt psensor.schemas
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = psensor.schemas.in
-schema_DATA = psensor.schemas
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/$(schema_DATA)
 endif
 
 psensor.1: main.c $(top_srcdir)/configure.ac