From 8328d19662bc7cc61d2ed730a5acd7667838c416 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 22 Oct 2013 13:58:20 +0200
Subject: Add update-icon-cache config option for makedistcheck

---
 Makefile.am      |  2 ++
 configure.ac     | 10 ++++++++++
 data/Makefile.am |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 969b5c5..00cc0e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@ $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck
 
+DISTCHECK_CONFIGURE_FLAGS = --disable-icon-update
+
 DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
diff --git a/configure.ac b/configure.ac
index a622f23..c40cc48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,6 +243,16 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 else
         AC_MSG_RESULT(no)
 fi
+ 
+dnl ---------------------------------------------------------------------------
+dnl Enabel/disable icon cache generation
+dnl ---------------------------------------------------------------------------
+AC_ARG_ENABLE(icon-update, AC_HELP_STRING([--disable-icon-update],
+                                        [Disable icon cache update]))
+if (test "$enable_icon_update" != no); then
+        AC_PATH_PROG(UPDATE_ICON_CACHE, [gtk-update-icon-cache])
+fi
+AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"]) 
 
 AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $WARNINGCFLAGS"
 AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
diff --git a/data/Makefile.am b/data/Makefile.am
index dd8beb6..906c415 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -37,12 +37,12 @@ EXTRA_DIST = \
 	$(icon48_DATA) \
 	$(iconscalable_DATA)
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+gtk_update_icon_cache = $(UPDATE_ICON_CACHE) -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
 uninstall-hook: update-icon-cache
 update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
+	@-if test -z "$(DESTDIR)" && ICON_UPDATE; then \
 		echo "Updating Gtk icon cache."; \
 		$(gtk_update_icon_cache); \
 	else \
-- 
cgit v1.2.1


From 4a58b34af5831a8301cc704d384d3ce77766c7cb Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 22 Oct 2013 13:59:04 +0200
Subject: Remove non existing INSTALL file from EXTRA_DIST

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 00cc0e9..b0996e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = data po src
 ACLOCAL_AMFLAGS  = -I macros ${ACLOCAL_FLAGS}
 
 EXTRA_DIST = \
-	AUTHORS NEWS INSTALL COPYING README \
+	AUTHORS NEWS COPYING README \
 	ChangeLog \
 	autogen.sh \
 	configure.ac \
-- 
cgit v1.2.1


From af5c5da60f4220365539130dbe0334b78d6eac3e Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 22 Oct 2013 14:03:05 +0200
Subject: Fix EXTRA_DIST gsettings variable

---
 data/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 906c415..d9e7ea5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,7 +27,7 @@ convertdir = $(datadir)/MateConf/gsettings
 convert_DATA = mate-notification-daemon.convert
 
 EXTRA_DIST = \
-	$(gsettings_SCHEMAS_in_in) \
+	$(gsettings_SCHEMAS).in.in \
 	$(convert_DATA) \
 	$(service_DATA) \
 	$(icon16_DATA) \
-- 
cgit v1.2.1


From 14d28b255c8e9fc26cc6e6bf0fc96d938f88fa27 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 22 Oct 2013 14:06:42 +0200
Subject: Add CLEANFILES to delete generated schema file

---
 data/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/Makefile.am b/data/Makefile.am
index d9e7ea5..1aec612 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -37,6 +37,8 @@ EXTRA_DIST = \
 	$(icon48_DATA) \
 	$(iconscalable_DATA)
 
+CLEANFILES = $(gsettings_SCHEMAS)
+
 gtk_update_icon_cache = $(UPDATE_ICON_CACHE) -f -t $(datadir)/icons/hicolor
 
 install-data-hook: update-icon-cache
-- 
cgit v1.2.1