From 496c25d455dcfee40aae7a7a6a35445b76c409cf Mon Sep 17 00:00:00 2001
From: Anoop M S <anoopms@disroot.org>
Date: Tue, 16 Jul 2024 22:48:05 +0530
Subject: [PATCH] Remove install path config (use -Dprefix=/usr instead)

---
 icons/meson.build |  2 +-
 meson.build       | 24 +-----------------------
 src/meson.build   |  6 +++---
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/icons/meson.build b/icons/meson.build
index 718974e..7363a69 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -1,4 +1,4 @@
 install_subdir(
   ['48x48'],
-  install_dir: data_dir + '/icons/hicolor',
+  install_dir:  get_option('datadir') + '/icons/hicolor',
 )
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 1a2ef28..aa1e1d7 100644
--- a/meson.build
+++ b/meson.build
@@ -8,28 +8,6 @@ fcitx5_core_dep = dependency('Fcitx5Core')
 fcitx5_module_dep = dependency('Fcitx5Module', components: ['Punctuation'])
 varnam_dep = dependency('govarnam')
 
-# fcitx5 install paths
-# ---------------------
-# The default fcitx5 addon lib install path depends on CMAKE_INSTALL_FULL_LIBDIR variable.
-# Since it is not possible to directly access this value, we have to check the directories and
-# set the install path.
-if (
-  fs.exists('/usr/lib/x86_64-linux-gnu/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake')
-)
-  # Debian based distros
-  lib_dir = '/usr/lib/x86_64-linux-gnu'
-elif (fs.exists('/usr/lib/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake'))
-  # Arch
-  lib_dir = '/usr/lib'
-elif (fs.exists('/usr/lib64/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake'))
-  # Fedora
-  lib_dir = '/usr/lib64'
-else
-  lib_dir = get_option('libdir')
-endif
-
-data_dir = get_option('datadir')
-
 if get_option('varnam_debug')
   add_global_arguments('-DDEBUG_MODE', language: 'cpp')
 endif
@@ -53,5 +31,5 @@ subdir('icons')
 install_data(
   'com.varnamproject.Fcitx5.Addon.varnamfcitx.metainfo.xml.in',
   rename: 'com.varnamproject.Fcitx5.Addon.varnamfcitx.metainfo.xml',
-  install_dir: data_dir + '/metainfo',
+  install_dir:  get_option('datadir') + '/metainfo',
 )
\ No newline at end of file
diff --git a/src/meson.build b/src/meson.build
index db60f47..8f0b2e8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,13 +11,13 @@ shared_library(
   varnam_fcitx_sources,
   dependencies: [fcitx5_core_dep, fcitx5_module_dep, varnam_dep],
   install: true,
-  install_dir: lib_dir + '/fcitx5',
+  install_dir: get_option('libdir')  + '/fcitx5',
 )
 
 # Input Method registration file
 install_data(
   'varnamfcitx.conf',
-  install_dir: data_dir + '/fcitx5/inputmethod',
+  install_dir: get_option('datadir') +'/fcitx5/inputmethod',
 )
 
 # Addon config file
@@ -25,5 +25,5 @@ configure_file(
   configuration: config_data,
   input: 'varnamfcitx-addon.conf.in',
   output: 'varnamfcitx.conf',
-  install_dir: data_dir + '/fcitx5/addon',
+  install_dir: get_option('datadir') + '/fcitx5/addon',
 )
\ No newline at end of file