change SKK_DEFAULT_PATH to a directory

eagleoflqj · eagleoflqj · commit 82927a2a1d67 · 2025-12-08T20:06:07.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 
-set(SKK_DEFAULT_PATH "/usr/share/skk/SKK-JISYO.L" CACHE STRING "Default path of SKK")
+set(SKK_DEFAULT_PATH "/usr/share/skk/" CACHE STRING "Default path of SKK directory that has SKK-JISYO.L, could start with \$XDG_DATA_DIRS/")
+if(NOT "${SKK_DEFAULT_PATH}" MATCHES "/$")
+  message(FATAL_ERROR "SKK_DEFAULT_PATH must be a directory ending with a slash")
+endif()
 
 include(GNUInstallDirs)
 
diff --git a/src/dictionary_list.in b/src/dictionary_list.in
@@ -1,2 +1,2 @@
 type=file,file=$FCITX_CONFIG_DIR/skk/user.dict,mode=readwrite
-type=file,file=@SKK_DEFAULT_PATH@,mode=readonly
+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.L,mode=readonly

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`type=file,file=$FCITX_CONFIG_DIR/skk/user.dict,mode=readwrite`
`2`		`-type=file,file=@SKK_DEFAULT_PATH@,mode=readonly`
	`2`	`+type=file,file=@SKK_DEFAULT_PATH@SKK-JISYO.L,mode=readonly`