diff --git a/meson.build b/meson.build index 4b192847c..470ea6432 100644 --- a/meson.build +++ b/meson.build @@ -295,7 +295,11 @@ if get_option('gtk_doc') subdir('docs/reference') endif -meson.add_install_script('meson/postinstall.py') +gnome.post_install( + glib_compile_schemas: true, + gtk_update_icon_cache: true +) + meson.add_dist_script('meson/generate-manpages.py') meson.add_dist_script('meson/generate-stylesheets.py') meson.add_dist_script('meson/check-version.py', meson.project_version(), 'NEWS') diff --git a/meson/postinstall.py b/meson/postinstall.py deleted file mode 100755 index 81afb18b7..000000000 --- a/meson/postinstall.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python3 - -import os -import subprocess - -prefix = os.environ.get('MESON_INSTALL_PREFIX', '/usr/local') -datadir = os.path.join(prefix, 'share') - -# Packaging tools define DESTDIR and this isn't needed for them -if 'DESTDIR' not in os.environ: - print('Updating icon cache...') - icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') - if not os.path.exists(icon_cache_dir): - os.makedirs(icon_cache_dir) - subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) - - print('Updating desktop database...') - desktop_database_dir = os.path.join(datadir, 'applications') - if not os.path.exists(desktop_database_dir): - os.makedirs(desktop_database_dir) - subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) - - print('Compiling GSettings schemas...') - schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas') - if not os.path.exists(schemas_dir): - os.makedirs(schemas_dir) - subprocess.call(['glib-compile-schemas', schemas_dir]) diff --git a/subprojects/extensions-app/build-aux/meson/postinstall.py b/subprojects/extensions-app/build-aux/meson/postinstall.py deleted file mode 120000 index cf3400350..000000000 --- a/subprojects/extensions-app/build-aux/meson/postinstall.py +++ /dev/null @@ -1 +0,0 @@ -../../../../meson/postinstall.py \ No newline at end of file diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build index 21dd44825..432ea1baa 100644 --- a/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build @@ -60,7 +60,9 @@ if not meson.is_subproject() subdir('po') - meson.add_install_script('build-aux/meson/postinstall.py') + gnome.post_install( + gtk_update_icon_cache: true + ) if appstream_util.found() meson.add_dist_script('build-aux/meson/check-version.py',