From 03511bd014373776afc8f0365bc9862d4b1fbcdd Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sat, 1 Oct 2022 22:53:11 +0800 Subject: [PATCH] Config: respect CMAKE_INSTALL_SYSCONFDIR --- CMakeLists.txt | 4 ++++ src/fastfetch.c | 2 +- src/fastfetch_config.h.in | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 604eff6a8..75992631f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 # ################# diff --git a/src/fastfetch.c b/src/fastfetch.c index f436c84ef..f2b2e2aae 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -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) diff --git a/src/fastfetch_config.h.in b/src/fastfetch_config.h.in index bc5dde521..982a5a313 100644 --- a/src/fastfetch_config.h.in +++ b/src/fastfetch_config.h.in @@ -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