Remove absolute installation paths so that DLT can be installed at an…

…y location (not only "/usr"). Signed-off-by: Jacques GUILLOU <[email protected]>
clipka · Apr 2, 2015 · cb4950d · cb4950d
1 parent 2cec5d2
commit cb4950d
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,6 +119,14 @@ configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}
 configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY)
 install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT devel)
 
+IF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+	set(CONFIGURATION_FILES_DIR "/etc")
+ELSE()
+	set(CONFIGURATION_FILES_DIR "${CMAKE_INSTALL_PREFIX}/etc")
+ENDIF()
+
+add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}")
+
 add_subdirectory( cmake )
 
 if(WITH_SYSTEMD OR WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD_JOURNAL)

diff --git a/examples/example1/CMakeLists.txt b/examples/example1/CMakeLists.txt
@@ -21,12 +21,6 @@
 cmake_minimum_required( VERSION 2.6 )
 project( automotive-dlt-example1 )
 
-#
-# set prefix
-#
-
-set( CMAKE_INSTALL_PREFIX "/usr" )
-
 #
 # find dependency packages
 #

diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt
@@ -21,12 +21,6 @@
 cmake_minimum_required( VERSION 2.6 )
 project( automotive-dlt-example2 )
 
-#
-# set prefix
-#
-
-set( CMAKE_INSTALL_PREFIX "/usr" )
-
 #
 # find dependency packages
 #

diff --git a/examples/example3/CMakeLists.txt b/examples/example3/CMakeLists.txt
@@ -21,12 +21,6 @@
 cmake_minimum_required( VERSION 2.6 )
 project( automotive-dlt-example3 )
 
-#
-# set prefix
-#
-
-set( CMAKE_INSTALL_PREFIX "/usr" )
-
 #
 # find dependency packages
 #

diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
@@ -30,4 +30,6 @@ install(TARGETS dlt-daemon
 			WORLD_EXECUTE WORLD_READ
 	COMPONENT base)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf DESTINATION /etc COMPONENT base)
+INSTALL(FILES dlt.conf
+	DESTINATION ${CONFIGURATION_FILES_DIR}
+	COMPONENT base)
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
@@ -91,7 +91,7 @@ void usage()
     printf("Options:\n");
     printf("  -d            Daemonize\n");
     printf("  -h            Usage\n");
-    printf("  -c filename   DLT daemon configuration file (Default: /etc/dlt.conf)\n");
+    printf("  -c filename   DLT daemon configuration file (Default: " CONFIGURATION_FILES_DIR "/dlt.conf)\n");
 } /* usage() */
 
 /**
@@ -196,7 +196,7 @@ int option_file_parser(DltDaemonLocal *daemon_local)
 	if(daemon_local->flags.cvalue[0])
 		filename = daemon_local->flags.cvalue;
 	else
-		filename = "/etc/dlt.conf";
+		filename = CONFIGURATION_FILES_DIR "/dlt.conf";
     //printf("Load configuration from file: %s\n",filename);
 	pFile = fopen (filename,"r");
 

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
@@ -30,5 +30,6 @@ install(TARGETS dlt-dbus
 	RUNTIME DESTINATION bin
 	COMPONENT base)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-dbus.conf DESTINATION /etc COMPONENT base)
-
+INSTALL(FILES dlt-dbus.conf
+	DESTINATION ${CONFIGURATION_FILES_DIR}
+	COMPONENT base)
diff --git 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
@@ -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

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -57,4 +57,6 @@ install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-us
 	RUNTIME DESTINATION bin
 	COMPONENT base)
 
-INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dlt-filetransfer)
+INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png
+	DESTINATION share/dlt-filetransfer
+)