From a68a5d7fa9be1724d315ff631b2664fac3368643 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 7 Nov 2013 11:04:54 +0000 Subject: [PATCH] fixed wrong replace for SYSCONFDIR, fixed wrong config file --- CMakeLists.txt | 2 +- arangod/CMakeLists.txt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eafbe911f..9cbb3adb9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ endif () file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE) -add_definitions("-D_ETCDIR_=\"${ETCDIR_NATIVE}\"") +add_definitions("-D_SYSCONFDIR_=\"${ETCDIR_NATIVE}\"") ################################################################################ ### @brief DATA DIRECTORY (/var) diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index a33488e1bf..94fd1dbc79 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -157,13 +157,10 @@ if (USE_RAW_CONFIG) endif () if (BUILD_PACKAGE STREQUAL "raspbian") - install( - FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf - DESTINATION ${ETCDIR_NATIVE}) - install( FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf - DESTINATION ${ETCDIR_NATIVE}) + DESTINATION ${ETCDIR_NATIVE} + RENAME arangod.conf) else () install( FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf