diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2019-04-06 16:29:34 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2019-08-20 12:17:09 +0200 |
| commit | 25feab1d664423feb31c3d0a780127176cfe7250 (patch) | |
| tree | 25985bb5a14ba750b4dd9f35d824473ffd9a6498 | |
| parent | 3676503ee639097b7c56683525095977724fb569 (diff) | |
| download | shared-mime-info-25feab1d664423feb31c3d0a780127176cfe7250.tar.gz | |
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
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 74141df7..7de8e6f0 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 |