billreminder r653 - in trunk: . data

[ogmaciel svn gnome org]

Author: ogmaciel
Date: Sat Sep 27 21:48:30 2008
New Revision: 653
URL: http://svn.gnome.org/viewvc/billreminder?rev=653&view=rev

Log:
Make sure that gconf is run (if available) and register schema.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/data/Makefile.am

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Sep 27 21:48:30 2008
@@ -2,7 +2,9 @@
 ==================
 
 Backend:
-  * Fixed an issue where datadir was hard coded to '/usr/share' (Bug #553890).
+  * Fixed an issue where datadir was hard coded to '/usr/share'. (Bug #553890).
+  * Make sure that gconf is run (if available) and register schema. Partially
+  fixes Bug #553694.
 
 BillReminder 0.3.2
 ==================

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sat Sep 27 21:48:30 2008
@@ -38,19 +38,18 @@
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \
-		--makefile-install-rule $(schemas_DATA) || \
-		(echo ;\
-		echo "*****************************************************"; \
-		echo "Installation of schemas failed, install them manually"; \
-		echo "*****************************************************";)
-	@true
+	if test -z "$(DESTDIR)" ; then \
+		for p in $(schemas_DATA) ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
+		done \
+	fi
+uninstall-local:
+	for p in $(schemas_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
+	done
 else
 install-data-local:
-	@echo "***************************************************************"
-	@echo "Not installing schemas, disabled with --disable-schemas-install"
-	@echo "***************************************************************"
-	@true
+uninstall-local:
 endif
 
 EXTRA_DIST = \
@@ -58,4 +57,3 @@
 	$(service_in_files) \
 	$(desktop_in_files) \
 	$(autostart_in_files)
-