diff options
| author |  Patrick Griffis <tingping@tingping.se> | 2016-01-23 16:58:05 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-01-23 16:58:05 -0500 |
| commit | 7228a98cd3d0b1f3b66737e20af5001a847b2a14 (patch) | |
| tree | 2926f8e4ab5e043db45c3bf2edb970389063043f /m4 | |
| parent | 36d32c0c9a86ada87843b062f81783c8711dec3e (diff) | |
build: Fix make distcheck
Removes any left-over files.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/desktop.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/m4/desktop.m4 b/m4/desktop.m4 index 18292ad..ead6c73 100644 --- a/m4/desktop.m4 +++ b/m4/desktop.m4 @@ -34,8 +34,14 @@ AC_DEFUN([DESKTOP_FILE], AC_SUBST([DESKTOP_FILE_VALIDATE])])], [have_desktop_validate=no]) - AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database]) - AS_IF([test "x$UPDATE_DESKTOP_DATABASE" != "x"], [AC_SUBST([UPDATE_DESKTOP_DATABASE])]) + AC_ARG_ENABLE([desktop-database-update], + [AS_HELP_STRING([--disable-desktop-database-update], + [Disable generating the desktop database, useful for packaging])]) + + AS_IF([test "x$enable_desktop_database_update" != "xno"], [ + AC_PATH_PROG([UPDATE_DESKTOP_DATABASE], [update-desktop-database]) + AS_IF([test "x$UPDATE_DESKTOP_DATABASE" != "x"], [AC_SUBST([UPDATE_DESKTOP_DATABASE])]) + ]) AC_PATH_PROG([DESKTOP_FILE_INSTALL], [desktop-file-install]) AS_IF([test "x$DESKTOP_FILE_INSTALL" != "x"], [AC_SUBST([DESKTOP_FILE_INSTALL])]) @@ -70,7 +76,7 @@ install-desktop-file: $(desktop_FILES) if test -n "$^"; then \ test -z "$(desktopfiledir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfiledir)"; \ if test -n "$(DESKTOP_FILE_INSTALL)"; then \ - $(DESKTOP_FILE_INSTALL) --dir="$(DESTDIR)$(desktopfiledir)" --mode=644 --rebuild-mime-info-cache $^; \ + $(DESKTOP_FILE_INSTALL) --dir="$(DESTDIR)$(desktopfiledir)" --mode=644 $^; \ else \ $(INSTALL_DATA) $^ "$(DESTDIR)$(desktopfiledir)"; \ fi; \ @@ -99,4 +105,4 @@ AC_DEFUN([_DESKTOP_FILE_SUBST], AC_SUBST([$1]) m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) ] -)
\ No newline at end of file +) |