[gok] [build] Fix make distcheck
- From: Gerd Kohlberger <gerdk src gnome org>
- To: svn-commits-list gnome org
- Cc: 
- Subject: [gok] [build] Fix make distcheck
- Date: Mon, 24 Aug 2009 17:46:54 +0000 (UTC)
commit bb8b25be49966f615aac90635de7ddfa07b412c0
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Mon Aug 24 15:18:51 2009 +0200
    [build] Fix make distcheck
    
    - Uninstall gconf schemas during make uninstall
    - Use uninstall-hook instead of uninstall-local to delete
      $(DESTDIR)$(datadir)/gok.
 Makefile.am |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1e00c00..622c407 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ sound_DATA =		\
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
+uninstall-hook: update-icon-cache remove-keyboard-files
 update-icon-cache:
 	@-if test -z "$(DESTDIR)"; then \
 		echo "Updating Gtk icon cache."; \
@@ -64,6 +64,8 @@ update-icon-cache:
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
+remove-keyboard-files:
+	@rm -rf $(DESTDIR)$(datadir)/gok
 
 EXTRA_DIST = \
 	README				\
@@ -145,12 +147,10 @@ endif
 	done
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(datadir)/gok
-	@for l in *; do 						\
-		if [ -f $$l/main.kbd ]; then 				\
-			rm -rf $$l;					\
-		fi;							\
-	done
+if GCONF_SCHEMAS_INSTALL
+	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+	gconftool-2 --makefile-uninstall-rule $(schema_DATA)
+endif
 
 webdoc: gokwebdoc.tar.gz
 
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]