1From 3bcb00e27ab09c433fdfecace0d48a6a7ed55ea8 Mon Sep 17 00:00:00 2001 2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 3Date: Fri, 22 Apr 2016 23:14:32 +0200 4Subject: [PATCH] Remove incorrect dependency from install-data-hook 5 6Having install-binPROGRAMS as a dependency of install-data-hook is not 7correct, as it causes the installation of programs to be executed 8twice, and those two installations are racing with each other, causing 9random installation failures. 10 11In addition, this dependency is not needed: the install-data-hook 12calls the update-mime-database program in one of two ways: 13 14 - When cross-compiling, using the program pointed by 15 UPDATE_MIME_DATABASE, which is already built, and is not installed 16 by install-binPROGRAMS. 17 18 - When compiling natively, suing the update-mime-database from the 19 build directory, so there is no need to depend on 20 install-binPROGRAMS. 21 22This patch is similar to the patch used by the Yocto Project at 23http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch. 24 25Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 26[Upstream status: 27https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/18] 28--- 29 Makefile.am | 2 +- 30 1 file changed, 1 insertion(+), 1 deletion(-) 31 32diff --git a/Makefile.am b/Makefile.am 33index 6fc4f73..c318dc3 100644 34--- a/Makefile.am 35+++ b/Makefile.am 36@@ -52,7 +52,7 @@ else 37 update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" 38 endif 39 40-install-data-hook: install-binPROGRAMS 41+install-data-hook: 42 if ENABLE_UPDATE_MIMEDB 43 $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" 44 endif 45-- 462.6.4 47 48