billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=06bdea5142b8191fd64c3ff80aa8fd662e8a2347
commit 06bdea5142b8191fd64c3ff80aa8fd662e8a2347 Author: Boris Faure <[email protected]> Date: Mon Nov 18 19:00:08 2019 +0100 terminology.desktop: set full path of icon --- data/desktop/meson.build | 14 ++++++++++++-- .../{terminology.desktop => terminology.desktop.in} | 2 +- meson.build | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/data/desktop/meson.build b/data/desktop/meson.build index 1eb4019..8c16dbe 100644 --- a/data/desktop/meson.build +++ b/data/desktop/meson.build @@ -1,2 +1,12 @@ -install_data('terminology.desktop', - install_dir: join_paths(get_option('datadir'), 'applications')) +icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'), + get_option('datadir'), + 'icons/hicolor/128x128/apps')) + +custom_target( + 'terminology.desktop', + input : 'terminology.desktop.in', + output: 'terminology.desktop', + command : [sed, icon_sed, '@INPUT@'], + capture : true, + install : true, + install_dir : join_paths(get_option('datadir'), 'applications')) diff --git a/data/desktop/terminology.desktop b/data/desktop/terminology.desktop.in similarity index 95% rename from data/desktop/terminology.desktop rename to data/desktop/terminology.desktop.in index 020891d..6d57027 100644 --- a/data/desktop/terminology.desktop +++ b/data/desktop/terminology.desktop.in @@ -19,6 +19,6 @@ Comment[ru]=Эмулятор терминала Comment[ko]=터미널 에뮬레이터 Keywords=shell;prompt;command;commandline; Exec=terminology -Icon=terminology +Icon=%ICON_PATH%/terminology.png Categories=System;TerminalEmulator; StartupWMClass=terminology diff --git a/meson.build b/meson.build index 81e80fd..36ac0e0 100644 --- a/meson.build +++ b/meson.build @@ -127,6 +127,8 @@ endif message('edje_cc set to:' + edje_cc) +sed = find_program('sed') + configure_file(output: 'terminology_config.h', configuration: config_data) --
