Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.4' into devel

This commit is contained in:
Frank Celler 2013-11-07 12:06:30 +01:00
parent 44ccf72f6c a68a5d7fa9
commit ce25e9dbc8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -117,7 +117,7 @@ endif ()
file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE) file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE)
add_definitions("-D_ETCDIR_=\"${ETCDIR_NATIVE}\"") add_definitions("-D_SYSCONFDIR_=\"${ETCDIR_NATIVE}\"")
################################################################################ ################################################################################
### @brief DATA DIRECTORY (/var) ### @brief DATA DIRECTORY (/var)

7
arangod/CMakeLists.txt
View File

@ -157,13 +157,10 @@ if (USE_RAW_CONFIG)
endif () endif ()
if (BUILD_PACKAGE STREQUAL "raspbian") if (BUILD_PACKAGE STREQUAL "raspbian")
install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
DESTINATION ${ETCDIR_NATIVE})
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
DESTINATION ${ETCDIR_NATIVE}) DESTINATION ${ETCDIR_NATIVE}
RENAME arangod.conf)
else () else ()
install( install(
FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf