From f08100bae29b2731e0069fe5a1a360142c0ca19e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 21 Aug 2019 15:20:35 +1000 Subject: [PATCH] meson.build: de-duplicate the icondir defines Signed-off-by: Peter Hutterer --- data/meson.build | 3 --- meson.build | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/meson.build b/data/meson.build index 3f887c7..54631e2 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,8 +1,5 @@ gnome = import('gnome') -desktopdir = join_paths(datadir, 'applications') -icondir_scalable = join_paths(datadir, 'icons', 'hicolor', 'scalable', 'apps') -icondir_symbolic = join_paths(datadir, 'icons', 'hicolor', 'symbolic', 'apps') metainfodir = join_paths(datadir, 'metainfo') conf = configuration_data() diff --git a/meson.build b/meson.build index 71c3712..19daead 100644 --- a/meson.build +++ b/meson.build @@ -16,7 +16,9 @@ pkgdatadir = join_paths(datadir, meson.project_name()) bindir = join_paths(prefix, get_option('bindir')) podir = join_paths(meson.source_root(), 'po') desktopdir = join_paths(datadir, 'applications') -icondir = join_paths(datadir, 'icons', 'hicolor', 'scalable', 'apps') +icondir = join_paths(datadir, 'icons', 'hicolor') +icondir_scalable = join_paths(icondir, 'scalable', 'apps') +icondir_symbolic = join_paths(icondir, 'symbolic', 'apps') metainfodir = join_paths(datadir, 'metainfo') libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'tuhi')