]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
CMake - add libexecdir to the replaced variables
authorDaniel Gryniewicz <dang@redhat.com>
Fri, 1 Jul 2016 13:04:17 +0000 (09:04 -0400)
committerDaniel Gryniewicz <dang@redhat.com>
Fri, 1 Jul 2016 13:04:17 +0000 (09:04 -0400)
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
src/CMakeLists.txt

index e60e2839df94a9b559d02d52633296251104b58b..9178d258bad759f37bc14673513800653d258787 100644 (file)
@@ -10,6 +10,7 @@ set(bindir ${CMAKE_INSTALL_FULL_BINDIR})
 set(sbindir ${CMAKE_INSTALL_FULL_SBINDIR})
 set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
 set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR})
+set(libexecdir ${CMAKE_INSTALL_FULL_LIBEXECDIR})
 set(pkgdatadir ${CMAKE_INSTALL_FULL_DATADIR})
 set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME})
 set(prefix ${CMAKE_INSTALL_PREFIX})
@@ -623,7 +624,7 @@ target_link_libraries(ceph-monstore-tool os global ${Boost_PROGRAM_OPTIONS_LIBRA
 install(TARGETS ceph-monstore-tool DESTINATION bin)
 install(PROGRAMS
   tools/ceph-monstore-update-crush.sh
-  DESTINATION lib/ceph)
+  DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ceph)
 
 add_executable(ceph-objectstore-tool
   tools/ceph_objectstore_tool.cc
@@ -1129,7 +1130,7 @@ install(FILES
 install(PROGRAMS
   ceph_common.sh
   ceph-osd-prestart.sh
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ceph)
+  DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ceph)
 
 install(PROGRAMS
   ${CMAKE_SOURCE_DIR}/src/ceph-create-keys