diff options
| author | infirit <[email protected]> | 2013-10-20 22:33:43 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-10-20 22:40:29 +0200 |
| commit | a1c0ddc581c0359e6e543cec5ac6502127a9d2a7 (patch) | |
| tree | 625092153e0f8266e8cf213fccf2636ef2f0c712 | |
| parent | 430d4f7216169ea06fa22f7fc26d270c9238ddc6 (diff) | |
| download | caja-a1c0ddc581c0359e6e543cec5ac6502127a9d2a7.tar.bz2 caja-a1c0ddc581c0359e6e543cec5ac6502127a9d2a7.tar.xz | |
Add update-icon-cache config option for makedistcheck
Otherwise the cache file is left behind and make distcheck fails.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | data/icons/Makefile.am | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 67339feb..a6b8cfdd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update -DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb --disable-icon-update --enable-gtk-doc ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 38b602c7..26399af1 100644 --- a/configure.ac +++ b/configure.ac @@ -440,6 +440,13 @@ AC_ARG_ENABLE(update-mimedb, enable_update_mimedb=yes) AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) +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"]) + AC_CONFIG_FILES([ Makefile cut-n-paste-code/Makefile diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 87345eb4..62e1b9c6 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -32,10 +32,10 @@ EXTRA_DIST = \ ############################################################################### -gtk_update_icon_cache = gtk-update-icon-cache -f -t +gtk_update_icon_cache = $(UPDATE_ICON_CACHE) -f -t update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ + @-if test -z "$(DESTDIR)" && ICON_UPDATE; then \ echo "Updating Gtk icon cache."; \ for theme in $(public_icons_themes); do \ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ |