From e8a7abb679ce54a23b9e63400897b386bd1b631f Mon Sep 17 00:00:00 2001 From: Hugo Holgersson Date: Fri, 2 Sep 2022 14:27:42 +0200 Subject: [PATCH] Move the prebuilt macOS icon to data/icons --- .../Contents/Resources => data/icons}/diffuse.icns | Bin data/icons/meson.build | 4 ++++ src/diffuse/meson.build | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) rename {src/diffuse/mac-os-app/Diffuse.app/Contents/Resources => data/icons}/diffuse.icns (100%) diff --git a/src/diffuse/mac-os-app/Diffuse.app/Contents/Resources/diffuse.icns b/data/icons/diffuse.icns similarity index 100% rename from src/diffuse/mac-os-app/Diffuse.app/Contents/Resources/diffuse.icns rename to data/icons/diffuse.icns diff --git a/data/icons/meson.build b/data/icons/meson.build index 2e3a308..ae47ea8 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -11,3 +11,7 @@ install_data( join_paths(symbolic_dir, ('@0@-symbolic.svg').format(application_id)), install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir) ) + +if build_machine.system() == 'darwin' + install_data('diffuse.icns', install_dir: '/Applications/Diffuse.app/Contents/Resources') +endif diff --git a/src/diffuse/meson.build b/src/diffuse/meson.build index bb02d4c..7ed885e 100644 --- a/src/diffuse/meson.build +++ b/src/diffuse/meson.build @@ -20,8 +20,6 @@ configure_file( ) if build_machine.system() == 'darwin' - install_subdir('mac-os-app/Diffuse.app', install_dir: '/Applications', strip_directory: false) - configure_file( input: 'mac-os-app/diffuse-mac.in', output: 'diffuse',