[gtk+] build: Fix post-install script



commit a4d08006734f5c3309dd31b87b05d89f0fa492a0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Aug 14 22:29:44 2017 +0100

    build: Fix post-install script
    
    Use the appropriate variable when expanding the input method modules
    path.

 build-aux/meson/post-install.sh |    4 ++--
 meson.build                     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/build-aux/meson/post-install.sh b/build-aux/meson/post-install.sh
index a59d7d5..c7390fa 100755
--- a/build-aux/meson/post-install.sh
+++ b/build-aux/meson/post-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gtk_version=$1
+gtk_api_version=$1
 gtk_abi_version=$2
 gtk_libdir=$3
 gtk_datadir=$4
@@ -17,5 +17,5 @@ if [ -z "$DESTDIR" ]; then
   gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
 
   echo Updating input method modules cache...
-  gtk4-query-immodules > ${gtk_libdir}/gtk-${version}/${gtk_abi_version}/immodules.cache
+  gtk4-query-immodules > ${gtk_libdir}/gtk-${gtk_api_version}/${gtk_abi_version}/immodules.cache
 fi
diff --git a/meson.build b/meson.build
index 53800f8..8fd6665 100644
--- a/meson.build
+++ b/meson.build
@@ -601,7 +601,7 @@ endif
 
 # Keep this in sync with post-install.sh expected arguments
 meson.add_install_script('build-aux/meson/post-install.sh',
-                         gtk_version,
+                         gtk_api_version,
                          gtk_binary_version,
                          gtk_libdir,
                          gtk_datadir)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]