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

make sure we always have properly defined whether we found systemd or… (#3379) 

* make sure we always have properly defined whether we found systemd or not.

* fix source file location - we don't pre-process this.
This commit is contained in:
Wilfried Goesgens 2017-10-06 10:19:18 +02:00 committed by Max Neunhöffer
parent a8ddaf56f6
commit c901af13c0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/ArangoDBInstall.cmake
View File

@ -131,6 +131,9 @@ install(
### @brief detect if we're on a systemd enabled system; if install unit file. ### @brief detect if we're on a systemd enabled system; if install unit file.
################################################################################ ################################################################################
set(SYSTEMD_FOUND false)
set(IS_SYSTEMD_INSTALL 0)
if (UNIX) if (UNIX)
if (${USE_ENTERPRISE}) if (${USE_ENTERPRISE})
set(SERVICE_NAME "arangodb3e") set(SERVICE_NAME "arangodb3e")
@ -143,7 +146,6 @@ if (UNIX)
if(NOT PKG_CONFIG_FOUND) if(NOT PKG_CONFIG_FOUND)
message(STATUS "pkg-config not found - skipping systemd detection") message(STATUS "pkg-config not found - skipping systemd detection")
else() else()
set(IS_SYSTEMD_INSTALL 0)
set(SYSTEMD_UNIT_DIR "") set(SYSTEMD_UNIT_DIR "")
message(STATUS "detecting systemd") message(STATUS "detecting systemd")
pkg_check_modules(SYSTEMD systemd) pkg_check_modules(SYSTEMD systemd)

2
cmake/packages/deb.cmake
View File

@ -104,7 +104,7 @@ else ()
# deploy the logrotate config: # deploy the logrotate config:
install( install(
FILES ${PROJECT_BINARY_DIR}/arangod.sysv FILES ${PROJECT_SOURCE_DIR}/Installation/logrotate.d/arangod.sysv
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/logrotate.d
RENAME ${SERVICE_NAME} RENAME ${SERVICE_NAME}