[gnome-logs/gnome-3-28] meson: fix undefined function in meson_post_install.py



commit 2f498464ac539fdf98199294bfb9205436b9c323
Author: Jonathan Kang <jonathankang gnome org>
Date:   Fri Jun 15 15:08:15 2018 +0800

    meson: fix undefined function in meson_post_install.py
    
    join_paths() is a function defined in meson. Use os.path.join() instead.
    
    (cherry picked from commit 59d2bf7b02607cc35c1b996080621fdeaeb29fcf)

 meson_post_install.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/meson_post_install.py b/meson_post_install.py
index 39d75c0..998a59c 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -3,10 +3,13 @@
 import os
 import subprocess
 
-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+install_prefix = os.environ['MESON_INSTALL_PREFIX']
+icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor')
+schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas')
 
 if not os.environ.get('DESTDIR'):
-    print('Compiling gsettings schemas...')
-    subprocess.call(['glib-compile-schemas', join_paths(gl_datadir, 'glib-2.0', 'schemas')])
     print('Updating icon cache...')
-    subprocess.call(['gtk-update-icon-cache --ignore-theme-index --force', join_paths(gl_datadir, 'icons', 
'hicolor')])
+    subprocess.call(['gtk-update-icon-cache', '--ignore-theme-index', '--force', icondir])
+
+    print('Compiling gsettings schemas...')
+    subprocess.call(['glib-compile-schemas', schemadir])


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