diff options
| author | Jonathan Kang <jonathankang@gnome.org> | 2018-06-15 15:08:15 +0800 |
|---|---|---|
| committer | Jonathan Kang <jonathankang@gnome.org> | 2018-06-15 15:28:28 +0800 |
| commit | 59d2bf7b02607cc35c1b996080621fdeaeb29fcf (patch) | |
| tree | e2a85015fd97d4a01038d71a4d64bd0d89daee38 /meson_post_install.py | |
| parent | 439d89072b1e884d343ae4348fbe5db0ad850a08 (diff) | |
| download | gnome-logs-59d2bf7b02607cc35c1b996080621fdeaeb29fcf.tar.gz | |
meson: fix undefined function in meson_post_install.py
join_paths() is a function defined in meson. Use os.path.join() instead.
Diffstat (limited to 'meson_post_install.py')
| -rw-r--r-- | meson_post_install.py | 11 |
1 files 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]) |