diff options
| author | Krzysztof Dynowski <k.dynowski@samsung.com> | 2018-01-10 15:11:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2018-01-10 15:11:28 +0000 |
| commit | 3af0c651707df2bd8e9c244d9cb28e4f4bb51f54 (patch) | |
| tree | da1803e737b94ec2abc539695ffeae4ac728bda1 | |
| parent | 2872e83849510dab933c9812e0be03a31e759fce (diff) | |
| parent | 5077eeb506a7332fb163d2167340d267d23f82a2 (diff) | |
| download | libteec-3af0c651707df2bd8e9c244d9cb28e4f4bb51f54.tar.gz libteec-3af0c651707df2bd8e9c244d9cb28e4f4bb51f54.tar.bz2 libteec-3af0c651707df2bd8e9c244d9cb28e4f4bb51f54.zip | |
Merge "Use CMake variables for sbin and etc files" into tizen
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | src/scripts/tef-update.sh.in (renamed from src/scripts/tef-update.sh) | 2 | ||||
| -rw-r--r-- | src/tef_libteec.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 862b80f..62d9aff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/scripts/tef-update.sh b/src/scripts/tef-update.sh.in index ecb8e0e..9920408 100755 --- a/src/scripts/tef-update.sh +++ b/src/scripts/tef-update.sh.in @@ -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 diff --git a/src/tef_libteec.c b/src/tef_libteec.c index 833b9f2..7e8fbb2 100644 --- a/src/tef_libteec.c +++ b/src/tef_libteec.c @@ -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" |