[gitg] Install correctly devel profile
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Install correctly devel profile
- Date: Sun, 12 Jul 2020 12:36:25 +0000 (UTC)
commit 8bb3509b311de2e395dfae56e3ba02bc7bbcf703
Author: Alberto Fanjul <albertofanjul gmail com>
Date: Sun Jul 12 14:35:56 2020 +0200
Install correctly devel profile
data/org.gnome.gitg.desktop.in.in | 4 ++--
meson.build | 5 ++---
meson_post_install.py | 8 +++++---
3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/data/org.gnome.gitg.desktop.in.in b/data/org.gnome.gitg.desktop.in.in
index 9ecc2d5a..77e65fd9 100644
--- a/data/org.gnome.gitg.desktop.in.in
+++ b/data/org.gnome.gitg.desktop.in.in
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=gitg
+Name=@binary@
Comment=Git repository browser
Exec=@binary@ --no-wd %U
-TryExec=gitg
+TryExec=@binary@
Terminal=false
Type=Application
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
diff --git a/meson.build b/meson.build
index 37bfa85a..f5db5ae8 100644
--- a/meson.build
+++ b/meson.build
@@ -206,9 +206,8 @@ configure_file(
meson.add_install_script(
'meson_post_install.py',
- gitg_datadir,
- (enable_python ? 'python' : ''),
- gitg_libdir,
+ gitg_name,
+ gitg_datadir
)
output = '\nConfiguration:\n\n'
diff --git a/meson_post_install.py b/meson_post_install.py
index 69d13785..36c2b335 100755
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -7,7 +7,9 @@ import subprocess
import sys
if not os.environ.get('DESTDIR'):
- icondir = os.path.join(sys.argv[1], 'icons', 'hicolor')
+ gitg_name = sys.argv[1]
+ datadir = sys.argv[2]
+ icondir = os.path.join(datadir, 'icons', 'hicolor')
name_pattern = re.compile('hicolor_(?:apps)_(?:\d+x\d+|scalable)_(.*)')
search_pattern = '/**/hicolor_*'
@@ -18,10 +20,10 @@ if not os.environ.get('DESTDIR'):
print('Update icon cache...')
subprocess.call(['gtk-update-icon-cache', '-f', '-t', '-q', icondir])
- icondir = os.path.join(sys.argv[1], 'gitg', 'icons', 'hicolor')
+ icondir = os.path.join(datadir, gitg_name, 'icons', 'hicolor')
subprocess.call(['gtk-update-icon-cache', '-f', '-t', '-q', icondir])
- schemadir = os.path.join(sys.argv[1], 'glib-2.0', 'schemas')
+ schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
print('Compiling gsettings schemas...')
subprocess.call(['glib-compile-schemas', schemadir])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]