diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ee9c0a7747971ce06edac42c0dbd952743581ce..6904f17f5f14f269c0a1b6c650b8bd68605b850e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,6 +171,16 @@ include_directories("${PROJECT_SOURCE_DIR}/connector/c/tnt/include") include_directories("${PROJECT_SOURCE_DIR}/connector/c/tntsql/include") include_directories("${PROJECT_SOURCE_DIR}/connector/c/tntnet/include") +# +# Specify prefixes +# +if (NOT DEFINED CMAKE_SYSCONF_DIR) + set (CMAKE_SYSCONF_DIR "${CMAKE_INSTALL_PREFIX}/etc") +endif() +if (NOT DEFINED CMAKE_LOCALSTATE_DIR) + set (CMAKE_LOCALSTATE_DIR "${CMAKE_INSTALL_PREFIX}/var") +endif() + # # Now handle all configuration options. # @@ -246,7 +256,7 @@ add_subdirectory(doc EXCLUDE_FROM_ALL) add_subdirectory(extra) install (FILES README LICENSE doc/box-protocol.txt - DESTINATION doc) + DESTINATION share/doc/tarantool) include (cmake/tarantool_cpack.cmake) # diff --git a/client/tarantool/CMakeLists.txt b/client/tarantool/CMakeLists.txt index c681e09d0e954cfd1d261a9146836bd7ae95d296..cdaf531fd4304ddcc02e994d060ef04f66b53392 100644 --- a/client/tarantool/CMakeLists.txt +++ b/client/tarantool/CMakeLists.txt @@ -13,6 +13,7 @@ endif() set (cli_deps readline history) # trying to resolve readline dependencies +# find_library(WITH_NCURSES_LIB NAMES "ncurses") if (WITH_NCURSES_LIB) set(cli_deps ${cli_deps} ncurses) diff --git a/connector/c/tnt/CMakeLists.txt b/connector/c/tnt/CMakeLists.txt index 4cb0291af8bfeb9bd54e1dea96ee48aa371eda9f..0aa3c6de65c096b4cac03b36f197a58d82216a69 100644 --- a/connector/c/tnt/CMakeLists.txt +++ b/connector/c/tnt/CMakeLists.txt @@ -58,7 +58,7 @@ set_target_properties(tnt PROPERTIES COMPILE_FLAGS "${tnt_cflags}") # Shared library # -project(tnt) +project(tnt_shared) add_library(tnt_shared SHARED ${tnt_sources}) set_target_properties(tnt_shared PROPERTIES OUTPUT_NAME tnt) set_target_properties(tnt_shared PROPERTIES COMPILE_FLAGS "${tnt_cflags}") diff --git a/connector/c/tntnet/CMakeLists.txt b/connector/c/tntnet/CMakeLists.txt index 9fb73cf3202cc9dab6bbd2158363c8ae7ae4c386..2df1f3a72febc49db51171bda9452de3eb72be00 100644 --- a/connector/c/tntnet/CMakeLists.txt +++ b/connector/c/tntnet/CMakeLists.txt @@ -49,7 +49,7 @@ set_target_properties(tntnet PROPERTIES COMPILE_FLAGS "${tntnet_cflags}") # Shared library # -project(tntnet) +project(tntnet_shared) add_library(tntnet_shared SHARED ${tntnet_sources}) set_target_properties(tntnet_shared PROPERTIES OUTPUT_NAME tntnet) set_target_properties(tntnet_shared PROPERTIES COMPILE_FLAGS "${tntnet_cflags}") diff --git a/connector/c/tntsql/CMakeLists.txt b/connector/c/tntsql/CMakeLists.txt index 9b011663aaea88320dce611bf08dac0d295d7510..49ac24c258eaa5d493e2a193f099d9afdcabcf90 100644 --- a/connector/c/tntsql/CMakeLists.txt +++ b/connector/c/tntsql/CMakeLists.txt @@ -48,7 +48,7 @@ set_target_properties(tntsql PROPERTIES COMPILE_FLAGS "${tntsql_cflags}") # Shared library # -project(tntsql) +project(tntsql_shared) add_library(tntsql_shared SHARED ${tntsql_sources}) set_target_properties(tntsql_shared PROPERTIES OUTPUT_NAME tntsql) set_target_properties(tntsql_shared PROPERTIES COMPILE_FLAGS "${tntsql_cflags}") diff --git a/core/tarantool.m b/core/tarantool.m index 6f37a7e9d2d0e12694be5ef9a7bd6811a149d0b4..90ef0082a2ac22f005c22b395039728a3b1c9367 100644 --- a/core/tarantool.m +++ b/core/tarantool.m @@ -60,7 +60,7 @@ static pid_t master_pid; #define DEFAULT_CFG_FILENAME "tarantool.cfg" -#define DEFAULT_CFG INSTALL_PREFIX "/etc/" DEFAULT_CFG_FILENAME +#define DEFAULT_CFG SYSCONF_DIR "/" DEFAULT_CFG_FILENAME const char *cfg_filename = NULL; char *cfg_filename_fullpath = NULL; char *binary_filename; diff --git a/include/config.h.cmake b/include/config.h.cmake index 69fd01096760d7bdb936d973f08efdcb32531577..80ae5a6c5d0a2c109c5e97ae928c8d4d90b80a2c 100644 --- a/include/config.h.cmake +++ b/include/config.h.cmake @@ -51,7 +51,7 @@ */ #cmakedefine HAVE_BYTE_ORDER_BIG_ENDIAN 1 -#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" +#define SYSCONF_DIR "@CMAKE_SYSCONF_DIR@" /* * vim: syntax=c */ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d28630b1666c0940ba9b39643880a97c70930a10..a73b0a7a6ce7f2920d39e5deb142520fcae9d7c2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,11 +1,10 @@ add_custom_target(test - COMMAND python ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --vardir=${PROJECT_BINARY_DIR}/test/var - ) + COMMAND python ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --vardir=${PROJECT_BINARY_DIR}/test/var) add_subdirectory(box) add_subdirectory(connector_c) install (FILES ${CMAKE_SOURCE_DIR}/test/box/tarantool.cfg - DESTINATION bin) + DESTINATION "${CMAKE_SYSCONF_DIR}") install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap - DESTINATION bin) + DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool")