From a17a4821ac20e46aa2289168596535a8ead01db1 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Sat, 29 Jul 2017 20:18:19 +0200 Subject: Fix make distcheck Add all headers to _SOURCES Cleanup update-mime-database (and c.o.) and disable them for distcheck as they leave files after uninstall --- data/Makefile.am | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 00b1478..c54614f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,8 +17,21 @@ Applicationicon_DATA += tp-monitor.png Applicationmime_DATA += tp-monitor.xml install-data-hook: - -update-mime-database -n $(datadir)/mime - -update-desktop-database $(Applicationdir) +if ENABLE_UPDATE_MIMEDB + @if $(AM_V_P); then set -x; else echo " INSTALL update-mime-database"; fi; \ + $(UPDATE_MIME_DATABASE) -n "$(datadir)/mime" + @if $(AM_V_P); then set -x; else echo " INSTALL update-desktop-database"; fi; \ + $(UPDATE_DESKTOP_DATABASE) "$(Applicationdir)" +endif + +uninstall-hook: +if ENABLE_UPDATE_MIMEDB + @if $(AM_V_P); then set -x; else echo " UNINSTALL update-mime-database"; fi; \ + $(UPDATE_MIME_DATABASE) "$(datadir)/mime" + @if $(AM_V_P); then set -x; else echo " UNINSTALL update-desktop-database"; fi; \ + $(UPDATE_DESKTOP_DATABASE) "$(Applicationdir)" +endif + endif if HAVE_GTK @@ -28,10 +41,21 @@ Application_DATA += tp-monitor-gtk.desktop .PHONY: install-data-gtk-hook install-data-gtk-hook: - -gtk-update-icon-cache $(datadir)/icons/hicolor +if ENABLE_UPDATE_MIMEDB + @if $(AM_V_P); then set -x; else echo " INSTALL gtk-update-icon-cache"; fi; \ + -$(GTK_UPDATE_ICON_CACHE) "$(datadir)/icons/hicolor" +endif + +uninstall-gtk-hook: +if ENABLE_UPDATE_MIMEDB + @if $(AM_V_P); then set -x; else echo " UNINSTALL gtk-update-icon-cache"; fi; \ + -$(GTK_UPDATE_ICON_CACHE) "$(datadir)/icons/hicolor" +endif install-data-hook: install-data-gtk-hook +uninstall-hook: uninstall-gtk-hook + endif if HAVE_QT -- cgit v1.2.3-70-g09d2