From 962d4e1c6462e0be889379ff887d516657f20f5a Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Wed, 11 Jan 2023 15:40:46 +0800
Subject: [PATCH] modify ukui-themes compile error

---
 meson.build        | 19 ++++++++++---------
 themes/meson.build | 10 +++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index 1c5681bc..b6838c94 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
 )
 install_subdir(
   'themes/ukui-dark/gtk-2.0',
-  install_dir: '/usr/share/themes/ukui-black',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
 
 )
 
@@ -16,39 +16,39 @@ install_subdir(
 
 install_subdir(
   'themes/ukui-dark/gtk-3.0',
-  install_dir: '/usr/share/themes/ukui-black',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
 
 )
 
 install_subdir(
   'themes/ukui-light/gtk-2.0',
-  install_dir: '/usr/share/themes/ukui',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui'),
 
 )
 install_subdir(
   'themes/ukui-light/gtk-3.0',
-  install_dir: '/usr/share/themes/ukui',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui'),
 
 )
 install_subdir(
   'themes/ukui-light/gtk-2.0',
-  install_dir: '/usr/share/themes/ukui-white',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
 
 )
 install_subdir(
   'themes/ukui-light/gtk-3.0',
-  install_dir: '/usr/share/themes/ukui-white',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
 
 )
 
 install_data(
   'ukui-custom.xml',
-  install_dir : '/usr/share/mime/packages/',
+  install_dir: join_paths(get_option('datadir'),'mime/packages'),
 )
 
 install_data(
   'debian/25_ubuntukylin-theme.gschema.override',
-  install_dir : '/usr/share/glib-2.0/schemas/',
+  install_dir: join_paths(get_option('datadir'),'glib-2.0/schemas/'),
 )
 
 install_subdir(
@@ -58,11 +58,12 @@ install_subdir(
 
 install_subdir(
   'blue-crystal',
-  install_dir: '/usr/share/icons',
+  install_dir: join_paths(get_option('datadir'),'icons'),
 )
 
 install_subdir(
   'dark-sense',
   install_dir: '/usr/share/icons',
+  install_dir: join_paths(get_option('datadir'),'icons'),
 )
 subdir('themes') 
diff --git a/themes/meson.build b/themes/meson.build
index 52c8322a..0d531f4b 100644
--- a/themes/meson.build
+++ b/themes/meson.build
@@ -1,27 +1,27 @@
 install_data(
   'ukui/index.theme.in',
   rename : 'index.theme',
-  install_dir : '/usr/share/themes/ukui',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui'),
 )
 install_data(
   'ukui-black/index.theme.in',
   rename : 'index.theme',
-  install_dir : '/usr/share/themes/ukui-black',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-black'),
 )
 
 install_data(
   'ukui-white/index.theme.in',
   rename : 'index.theme',
-  install_dir : '/usr/share/themes/ukui-white',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-white'),
 )
 install_data(
   'ukui-dark/index.theme.in',
   rename : 'index.theme',
-  install_dir : '/usr/share/themes/ukui-dark',
+  install_dir: join_paths(get_option('datadir'),'themes/dark'),
 )
 install_data(
   'ukui-light/index.theme.in',
   rename : 'index.theme',
-  install_dir : '/usr/share/themes/ukui-light',
+  install_dir: join_paths(get_option('datadir'),'themes/ukui-light'),
 )
 
-- 
2.33.0