diff options
| author | infirit <[email protected]> | 2013-10-22 13:58:20 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-10-22 14:37:24 +0200 |
| commit | 8328d19662bc7cc61d2ed730a5acd7667838c416 (patch) | |
| tree | ac11b40f4fc091a4f6ad2eb0e38fd4fbb969a571 | |
| parent | 0656ca9fb350ebcf05d205dc861cacc875067dd7 (diff) | |
| download | mate-notification-daemon-8328d19662bc7cc61d2ed730a5acd7667838c416.tar.bz2 mate-notification-daemon-8328d19662bc7cc61d2ed730a5acd7667838c416.tar.xz | |
Add update-icon-cache config option for makedistcheck
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | 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 \ |