From 69df75f268e2b3d5874f05e2b5a6125f6d990a03 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 25 Sep 2015 23:25:12 +0100 Subject: gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safety If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one ${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will actually be usable. Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately tied to the library and rarely directly invoked by the user, and update the callers to use the right path. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/postinst-intercepts/update_pixbuf_cache | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'scripts/postinst-intercepts/update_pixbuf_cache') diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 95bf4f90a3..a8b4001069 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache @@ -4,8 +4,6 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders export GDK_PIXBUF_FATAL_LOADER=1 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ - $D${bindir}/gdk-pixbuf-query-loaders \ + $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache - - -- cgit v1.2.3