From 9c441f1577020e61e750e596d3b50fa437f93440 Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Tue, 7 Jul 2015 19:15:30 +0300
Subject: [PATCH] Fix for OOS build install introduced by zloidemon
---
extra/dist/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/extra/dist/CMakeLists.txt b/extra/dist/CMakeLists.txt
index 23948b4ada..4db2c9e08d 100644
--- a/extra/dist/CMakeLists.txt
+++ b/extra/dist/CMakeLists.txt
@@ -13,7 +13,7 @@ if (ENABLE_RPM)
# chmod +x 655
if (WITH_SYSTEMD)
message (STATUS "Building RPM with SYSTEMD")
- install (FILES tarantool.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
+ install (FILES ${PROJECT_BINARY_DIR}/extra/dist/tarantool.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE
@@ -32,14 +32,14 @@ if (ENABLE_RPM)
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
endif(WITH_SYSTEMD)
- install (FILES default/tarantool DESTINATION
+ install (FILES ${PROJECT_BINARY_DIR}/extra/dist/default/tarantool DESTINATION
${CMAKE_INSTALL_SYSCONFDIR}/sysconfig/
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ
WORLD_READ)
else (ENABLE_RPM)
- install (FILES default/tarantool DESTINATION
+ install (FILES ${PROJECT_BINARY_DIR}/extra/dist/default/tarantool DESTINATION
${CMAKE_INSTALL_SYSCONFDIR}/default/
PERMISSIONS
OWNER_READ OWNER_WRITE
--
GitLab