]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake install ceph-monstore-update-crush.sh into ${CMAKE_INSTALL_LIBDIR}/ceph
authorKefu Chai <kchai@redhat.com>
Sat, 2 Jul 2016 09:05:23 +0000 (17:05 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 2 Jul 2016 11:17:05 +0000 (19:17 +0800)
ceph-monstore-update-crush.sh is a user-facing script, and it is not
used internally. also ceph.spec expects it that way. technically, we
should not install arch-indep files into ${CMAKE_INSTALL_LIBDIR}/ceph.
leave this for another changeset..

this partially reverts 37f53ec

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/CMakeLists.txt

index f30c8b4b395619f0f125b6bfc4fce23abea20d24..4aed659f42cf2d317147fe05f5b04f1a751bd2ce 100644 (file)
@@ -609,7 +609,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 ${CMAKE_INSTALL_LIBEXECDIR}/ceph)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/ceph)
 
 add_executable(ceph-objectstore-tool
   tools/ceph_objectstore_tool.cc