fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Config: respect CMAKE_INSTALL_SYSCONFDIR

Browse Source
This commit is contained in:
Carter Li
2022-10-01 22:53:11 +08:00
parent b0ad1294e4
commit 03511bd014
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4
View File
@@ -123,6 +123,10 @@ if(NOT TARGET_DIR_HOME)
endif()
endif()
if(NOT TARGET_DIR_ETC)
set(TARGET_DIR_ETC "${CMAKE_INSTALL_SYSCONFDIR}")
endif()
#################
# Tweak version #
#################
src/fastfetch.c
+1 -1
View File
@@ -1310,7 +1310,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
static void parseConfigFileSystem(FFinstance* instance, FFdata* data)
{
parseConfigFile(instance, data, FASTFETCH_TARGET_DIR_ROOT"/etc/fastfetch/config.conf");
parseConfigFile(instance, data, FASTFETCH_TARGET_DIR_ETC"/fastfetch/config.conf");
}
static void parseConfigFileUser(FFinstance* instance, FFdata* data)
src/fastfetch_config.h.in
+1
View File
@@ -11,6 +11,7 @@
#define FASTFETCH_TARGET_DIR_ROOT "@TARGET_DIR_ROOT@"
#define FASTFETCH_TARGET_DIR_USR "@TARGET_DIR_USR@"
#define FASTFETCH_TARGET_DIR_HOME "@TARGET_DIR_HOME@"
#define FASTFETCH_TARGET_DIR_ETC "@TARGET_DIR_ETC@"
#define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@"
#define FASTFETCH_DATATEXT_CONFIG_SYSTEM "@DATATEXT_CONFIG_SYSTEM@" //Requires FASTFETCH_PROJECT_VERSION to be set