From 3bcb00e27ab09c433fdfecace0d48a6a7ed55ea8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 22 Apr 2016 23:14:32 +0200 Subject: [PATCH] Remove incorrect dependency from install-data-hook Having install-binPROGRAMS as a dependency of install-data-hook is not correct, as it causes the installation of programs to be executed twice, and those two installations are racing with each other, causing random installation failures. In addition, this dependency is not needed: the install-data-hook calls the update-mime-database program in one of two ways: - When cross-compiling, using the program pointed by UPDATE_MIME_DATABASE, which is already built, and is not installed by install-binPROGRAMS. - When compiling natively, suing the update-mime-database from the build directory, so there is no need to depend on install-binPROGRAMS. This patch is similar to the patch used by the Yocto Project at http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch. Signed-off-by: Thomas Petazzoni [Upstream status: https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/18] --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6fc4f73..c318dc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,7 @@ else update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" endif -install-data-hook: install-binPROGRAMS +install-data-hook: if ENABLE_UPDATE_MIMEDB $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" endif -- 2.6.4