diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-11-02 15:48:30 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-11-02 15:48:30 +0000 |
| commit | cf8a8f3c2acbe2f05b0e2fbe98556440369bb10b (patch) | |
| tree | 78611f9f5fc0801f8233b7d5d9036fc1853c366f | |
| parent | 8a1361cac3f5c57bc3bbc953867c3243bd64231a (diff) | |
| parent | 1050ed212e29f81b24726317017d995e996a29b2 (diff) | |
| download | gnome-dictionary-cf8a8f3c2acbe2f05b0e2fbe98556440369bb10b.tar.gz | |
Merge branch 'use-gnome.post_install' into 'master'
build: Use GNOME module post_install()
See merge request Archive/gnome-dictionary!22
| -rw-r--r-- | build-aux/meson/post-install.py | 15 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 6 insertions, 18 deletions
diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py deleted file mode 100644 index b26c88a..0000000 --- a/build-aux/meson/post-install.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python3 - -import os -import subprocess - -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('Update icon cache...') - subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir]) - - print('Compiling gsettings schemas...') - subprocess.call(['glib-compile-schemas', schemadir]) diff --git a/meson.build b/meson.build index 4e3dcac..6cfad7c 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('gnome-dictionary', 'c', 'warning_level=1', ], license: 'GPL-2.0-or-later', - meson_version: '>= 0.54.0', + meson_version: '>= 0.57.0', ) gdict_version = meson.project_version().split('.') @@ -49,5 +49,8 @@ subdir('po') subdir('data') subdir('help') -# Post-installation trigger -meson.add_install_script('build-aux/meson/post-install.py') +# Post-installation +gnome.post_install( + glib_compile_schemas: true, + gtk_update_icon_cache: true, +) |