diff options
| author | Bastien Nocera <hadess@hadess.net> | 2017-02-12 18:11:03 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2017-02-12 19:45:18 +0100 |
| commit | 40e1b88b24da1f61a8161b39e3bb7aa16a5b9b5d (patch) | |
| tree | 260875fac708eb8eebe30c61d67cd294702d0ab0 /thumbnailer | |
| parent | 237c5c0400dd8df7e5c680184567327a0738bebd (diff) | |
| download | gdk-pixbuf-40e1b88b24da1f61a8161b39e3bb7aa16a5b9b5d.tar.gz | |
thumbnailer: Fix (nearly) empty MimeTypes in thumbnailer
Because we weren't waiting for loaders.cache to be created to run our
helper, and we weren't applying the environment variables to the correct
helper, we would end up with a broken list of supported MimeTypes.
https://bugzilla.gnome.org/show_bug.cgi?id=778451
Diffstat (limited to 'thumbnailer')
| -rw-r--r-- | thumbnailer/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am index 6f0c1499a..c9fe123f8 100644 --- a/thumbnailer/Makefile.am +++ b/thumbnailer/Makefile.am @@ -25,11 +25,10 @@ gdk_pixbuf_print_mime_types_LDADD = \ thumbnailerdir = $(datadir)/thumbnailers/ thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer -gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) - $(AM_V_GEN) GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache \ - GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata \ - $(SED) -e "s|\@bindir\@|$(bindir)|" \ - -e "s|\@mimetypes\@|`$(builddir)/gdk-pixbuf-print-mime-types`|" $< > $@ +gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) $(top_builddir)/gdk-pixbuf/loaders.cache + $(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|" \ + -e "s|\@mimetypes\@|`GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(builddir)/gdk-pixbuf-print-mime-types`|" \ + $< > $@ EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in |