From 039ecfa23216f4fe01d5b1a1ccd007b45392b156 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 19 May 2013 08:30:37 +0000 Subject: [PATCH] gconf optional --- src/Makefile.am | 6 +++--- src/Makefile.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8121536..c89c8a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,14 +86,14 @@ 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 if GCONF_SCHEMAS_INSTALL +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_DATA = psensor.schemas + install-data-local: GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA) endif diff --git a/src/Makefile.in b/src/Makefile.in index 7b973f5..cf78eef 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -365,10 +365,10 @@ psensor_SOURCES = cfg.h cfg.c graph.h graph.c main.c ui.h ui.c \ ui_sensorpref.h ui_sensorpref.c ui_status.h ui_status.c \ $(am__append_4) $(am__append_7) $(am__append_16) \ $(am__append_19) -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_DATA = psensor.schemas dist_man_MANS = psensor.1 EXTRA_DIST = description.txt psensor.schemas +@GCONF_SCHEMAS_INSTALL_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) +@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = psensor.schemas all: all-recursive .SUFFIXES: -- 2.7.4