Use CMake variables for sbin and etc files 84/166184/6
authorIgor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Mon, 8 Jan 2018 13:09:40 +0000 (14:09 +0100)
committerIgor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Tue, 9 Jan 2018 13:11:28 +0000 (14:11 +0100)
Change-Id: Ifb1002d68295fdade21e698490ab75a93920bae0
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>
CMakeLists.txt
src/scripts/tef-update.sh.in [moved from src/scripts/tef-update.sh with 82% similarity]
src/tef_libteec.c

index 862b80f..62d9aff 100644 (file)
@@ -84,13 +84,19 @@ IF(NOT DEFINED INCLUDE_INSTALL_DIR)
     SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
 ENDIF(NOT DEFINED INCLUDE_INSTALL_DIR)
 
+IF(NOT DEFINED SYSCONF_INSTALL_DIR)
+       SET(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}")
+ENDIF(NOT DEFINED SYSCONF_INSTALL_DIR)
+
 ADD_DEFINITIONS(-DLIB_INSTALL_DIR="${LIB_INSTALL_DIR}")
+ADD_DEFINITIONS(-DSYSCONF_INSTALL_DIR="${SYSCONF_INSTALL_DIR}")
 
 CONFIGURE_FILE(src/${TEF_PC}.in ${CMAKE_BINARY_DIR}/${TEF_PC} @ONLY)
+CONFIGURE_FILE(src/scripts/tef-update.sh.in ${CMAKE_BINARY_DIR}/scripts/tef-update.sh @ONLY)
 
 #install library
-INSTALL(FILES src/tef.conf DESTINATION /etc/tef/)
-INSTALL(PROGRAMS src/scripts/tef-update.sh DESTINATION /usr/sbin/)
+INSTALL(FILES src/tef.conf DESTINATION ${SYSCONF_INSTALL_DIR}/tef/)
+INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/scripts/tef-update.sh DESTINATION ${CMAKE_INSTALL_SBINDIR})
 INSTALL(TARGETS ${TEF_TARGET} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES       ${CMAKE_BINARY_DIR}/${TEF_PC}
         DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
similarity index 82%
rename from src/scripts/tef-update.sh
rename to src/scripts/tef-update.sh.in
index ecb8e0e..9920408 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TEF_CONF="/etc/tef/tef.conf"
+TEF_CONF="@SYSCONF_INSTALL_DIR@/tef/tef.conf"
 TEF_IMPLEMENTATION=$1
 
 if [ ! -f "$TEF_CONF" ]; then
index 833b9f2..7e8fbb2 100644 (file)
@@ -31,7 +31,7 @@
 #include "simulator/creators.h"
 #include "optee/creators.h"
 
-#define TEF_CONFIG_FILE "/etc/tef/tef.conf"
+#define TEF_CONFIG_FILE SYSCONF_INSTALL_DIR "/tef/tef.conf"
 #define TEF_CONFIG_MAXLINE 1024
 #define TEF_LIB_PATH LIB_INSTALL_DIR "/tef"
 #define TEF_IMPLEMENTATION_SONAME "libteec.so"