Skip to content

Commit

Permalink
meson: fix undefined function in meson_post_install.py
Browse files Browse the repository at this point in the history
join_paths() is a function defined in meson. Use os.path.join() instead.

(cherry picked from commit 59d2bf7)
  • Loading branch information
JonathanKang committed Jun 15, 2018
1 parent c4bc6b8 commit 2f49846
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions meson_post_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])

0 comments on commit 2f49846

Please sign in to comment.