[gdk-pixbuf/issue-126] Use the appropriate gdk-pixbuf-query-loaders on post-install

[Emmanuele Bassi <ebassi src gnome org>]

commit 5dfdeca4b8ad9810d534176339f1367910ecc71d
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Jun 29 15:24:30 2019 +0100

    Use the appropriate gdk-pixbuf-query-loaders on post-install
    
    We should not rely on the installation prefix being part of PATH, but is
    the location of the binary used by the build system.
    
    Fixes: #126

 build-aux/post-install.bat | 9 +++++----
 build-aux/post-install.sh  | 7 ++++---
 meson.build                | 2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/build-aux/post-install.bat b/build-aux/post-install.bat
index 60981ffb2..6994d49e1 100644
--- a/build-aux/post-install.bat
+++ b/build-aux/post-install.bat
@@ -1,13 +1,14 @@
 @echo off
 
-set libdir=%1
-set binary_version=%2
+set bindir=%1
+set libdir=%2
+set binary_version=%3
 
 set libdir_windows=%libdir:/=\%
 
 if not "%DESTDIR%" == "" goto warn_msg
 if not exist %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\ mkdir 
%libdir_windows%\gdk-pixbuf-2.0\%binary_version%
-gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
+%bindir%\gdk-pixbuf-query-loaders > %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
 
 goto end
 
@@ -20,4 +21,4 @@ echo *** using:
 echo ***   gdk-pixbuf-query-loaders ^> %libdir_windows%\gdk-pixbuf-2.0\%binary_version%\loaders.cache
 echo ***
 
-:end
\ No newline at end of file
+:end
diff --git a/build-aux/post-install.sh b/build-aux/post-install.sh
index 40a47cb4a..661bceeef 100644
--- a/build-aux/post-install.sh
+++ b/build-aux/post-install.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-libdir="$1"
-binary_version="$2"
+bindir="$1"
+libdir="$2"
+binary_version="$3"
 
 if [ -z "$DESTDIR" ]; then
         mkdir -p "$libdir/gdk-pixbuf-2.0/$binary_version"
-        gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
+        $bindir/gdk-pixbuf-query-loaders > "$libdir/gdk-pixbuf-2.0/$binary_version/loaders.cache"
 else
         echo "***"
         echo "*** Warning: loaders.cache not built"
diff --git a/meson.build b/meson.build
index 6c5fa36cb..0e17cdbcf 100644
--- a/meson.build
+++ b/meson.build
@@ -426,11 +426,13 @@ if not meson.is_cross_build()
   # On Visual Studio, we don't normally have a shell interpreter, so use a .bat
   if cc.get_id() == 'msvc'
     meson.add_install_script('build-aux/post-install.bat',
+      gdk_pixbuf_bindir,
       gdk_pixbuf_libdir,
       gdk_pixbuf_binary_version,
     )
   else
     meson.add_install_script('build-aux/post-install.sh',
+      gdk_pixbuf_bindir,
       gdk_pixbuf_libdir,
       gdk_pixbuf_binary_version,
     )