Commit cadd0060 authored by Adrian Bunk's avatar Adrian Bunk Committed by Bastien Nocera
Browse files

Makefile.am: ensure that update-mime-info doesn't get called before it's installed

This fixes the following error on parallel installs:

<--  snip  -->

make install
Makefile:939: warning: overriding commands for target `all'
Makefile:279: warning: ignoring old commands for target `all'
Making install in .
Makefile:939: warning: overriding commands for target `all'
Makefile:279: warning: ignoring old commands for target `all'
Makefile:939: warning: overriding commands for target `all'
Makefile:279: warning: ignoring old commands for target `all'
test -z "/usr/share/man/man1" || mkdir -p -- "/usr/share/man/man1"
test -z "/usr/share/mime/packages" || mkdir -p -- "/usr/share/mime/packages"
test -z "/usr/share/pkgconfig" || mkdir -p -- "/usr/share/pkgconfig"
 /scratchbox/tools/bin/install -c -m 644 'freedesktop.org.xml' '/usr/share/mime/packages/freedesktop.org.xml'
 /scratchbox/tools/bin/install -c -m 644 'shared-mime-info.pc' '/usr/share/pkgconfig/shared-mime-info.pc'
 /scratchbox/tools/bin/install -c -m 644 './update-mime-database.1' '/usr/share/man/man1/update-mime-database.1'
test -z "/usr/bin" || mkdir -p -- "/usr/bin"
make  install-data-hook
Makefile:939: warning: overriding commands for target `all'
Makefile:279: warning: ignoring old commands for target `all'
"/usr/bin/update-mime-database" -V "/usr/share/mime"
/scratchbox/tools/bin/sh: /usr/bin/update-mime-database: No such file or directory
make[4]: *** [install-data-hook] Error 127
make[3]: *** [install-data-am] Error 2
make[3]: *** Waiting for unfinished jobs....
  /scratchbox/tools/bin/install -c 'update-mime-database' '/usr/bin/update-mime-database'
make[2]: *** [install-am] Error 2
make[1]: *** [install-recursive] Error 1
make: *** [__matrix_install] Error 2

<--  snip  -->

http://bugs.freedesktop.org/show_bug.cgi?id=27252
parent 59d4c660
......@@ -46,7 +46,7 @@ $(pkgconfig_DATA): config.status
@INTLTOOL_XML_RULE@
@INTLTOOL_DESKTOP_RULE@
install-data-hook:
install-data-hook: install-binPROGRAMS
if ENABLE_UPDATE_MIMEDB
$(DESTDIR)"$(bindir)/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