summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--data/Makefile.am2
-rw-r--r--m4/desktop.m414
3 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 5260ca5..e1d0668 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
+DISTCHECK_CONFIGURE_FLAGS = --disable-desktop-database-update
SUBDIRS = extern src po data
DISTCLEANFILES = \
diff --git a/data/Makefile.am b/data/Makefile.am
index 740e28e..4b50c74 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,3 +11,5 @@ appdata_XML = $(appdata_in_files:.xml.in=.xml)
@APPSTREAM_XML_RULES@
EXTRA_DIST = $(desktop_in_files) $(appdata_in_files)
+
+DISTCLEANFILES = $(desktop_FILES) $(appdata_XML)
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
+)