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

Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-04-21 13:42:04 +02:00
parent b33390c1d4 1f1611a278
commit 59ee7e821b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/ArangoDBInstall.cmake
View File

@ -157,6 +157,9 @@ if (UNIX)
${ARANGODB_SOURCE_DIR}/Installation/systemd/arangodb3.service.in
${PROJECT_BINARY_DIR}/arangodb3.service
NEWLINE_STYLE UNIX)
if (CMAKE_INSTALL_PREFIX AND NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "/")
set(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_PREFIX}/${SYSTEMD_UNIT_DIR}/")
endif()
install(FILES ${PROJECT_BINARY_DIR}/arangodb3.service
DESTINATION ${SYSTEMD_UNIT_DIR}/
RENAME ${SERVICE_NAME}.service)

2
cmake/InstallMacros.cmake
View File

@ -75,7 +75,7 @@ macro (install_readme input output)
set(CRLFSTYLE "CRLF")
endif ()
install(
CODE "configure_file(${PROJECT_SOURCE_DIR}/${input} \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${where}${PKG_VERSION}/${output} NEWLINE_STYLE ${CRLFSTYLE})"
CODE "configure_file(${PROJECT_SOURCE_DIR}/${input} \$ENV{DESTDIR}/${where}${PKG_VERSION}/${output} NEWLINE_STYLE ${CRLFSTYLE})"
)
endmacro ()