summaryrefslogtreecommitdiff
path: root/src/system
diff options
context:
space:
mode:
authorJacques GUILLOU <jacques.guillou@pelagicore.com>2014-11-19 12:48:18 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2015-04-02 13:44:03 +0200
commitcb4950d12a96cc51557e185fc555edd4b4a0ca62 (patch)
treec039ee2fa6253598e316754cca126bc3ece9e8ff /src/system
parent2cec5d20ae0b5361a84bfb8170335f2502ddd88f (diff)
downloadDLT-daemon-cb4950d12a96cc51557e185fc555edd4b4a0ca62.tar.gz
Remove absolute installation paths so that DLT can be installed at any location (not only "/usr").
Signed-off-by: Jacques GUILLOU <jacques.guillou@pelagicore.com>
Diffstat (limited to 'src/system')
-rw-r--r--src/system/CMakeLists.txt4
-rw-r--r--src/system/dlt-system.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index 7768b5a..8398207 100644
--- a/src/system/CMakeLists.txt
+++ b/src/system/CMakeLists.txt
@@ -35,4 +35,6 @@ install(TARGETS dlt-system
RUNTIME DESTINATION bin
COMPONENT base)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf DESTINATION /etc COMPONENT base)
+INSTALL(FILES dlt-system.conf
+ DESTINATION ${CONFIGURATION_FILES_DIR}
+ COMPONENT base)
diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h
index 211b198..07cc2d6 100644
--- a/src/system/dlt-system.h
+++ b/src/system/dlt-system.h
@@ -57,7 +57,7 @@
#include "dlt_common.h"
// Constants
-#define DEFAULT_CONF_FILE "/etc/dlt-system.conf"
+#define DEFAULT_CONF_FILE ( CONFIGURATION_FILES_DIR "/dlt-system.conf")
#define DLT_SYSTEM_LOG_FILE_MAX 32
#define DLT_SYSTEM_LOG_DIRS_MAX 32
#define DLT_SYSTEM_LOG_PROCESSES_MAX 32