Commit 25feab1d authored by Fabrice Fontaine's avatar Fabrice Fontaine Committed by Bastien Nocera
Browse files

build: 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, using 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

Closes: !18
parent 3676503e
Pipeline #57433 passed with stage
in 8 minutes and 15 seconds
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment