Skip to content

Commit da7f628

Browse files
committed
Install icons into private directory
The icons 'plugin-*' have too generic name, and may conflict with other packages on the system. Move them back to the $prefix/share/wcm/icons/ directory to avoid possible collision. This partially reverts commit 84063a0
1 parent 14f2e03 commit da7f628

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

icons/desktop/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
install_data('wcm.svg', install_dir: join_paths(share_dir, 'icons', 'hicolor', 'scalable', 'apps'))
2+
install_data('wcm.svg', install_dir: join_paths(share_dir, 'wcm', 'icons'))

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ wayfire_sysconf_dir = wayfire.get_variable(pkgconfig: 'sysconfdir')
1515

1616
share_dir = join_paths(get_option('prefix'), 'share')
1717
wayfire_locale_dir = join_paths(share_dir, 'locale')
18-
wcm_icon_dir = join_paths(share_dir, 'icons', 'hicolor', 'scalable', 'apps')
18+
wcm_icon_dir = join_paths(share_dir, 'wcm', 'icons')
1919
wayfire_icon_dir = wayfire.get_variable(pkgconfig: 'icondir')
2020

2121
add_global_arguments('-DWAYFIRE_METADATADIR="' + wayfire_metadata_dir + '"', language : 'cpp')

0 commit comments

Comments
 (0)