summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2016-07-02 11:05:23 +0200
committerKefu Chai <kchai@redhat.com>2016-07-02 13:17:05 +0200
commitd4d3ee1414e96a7e673dc454153595c1327ed0c2 (patch)
tree6a9f8a40fce3963e86ca34de60968190b0230f19 /src
parentcmake: install lib{rgw,cephfs_jni} into ${CMAKE_INSTALL_LIBDIR} not lib (diff)
downloadceph-d4d3ee1414e96a7e673dc454153595c1327ed0c2.tar.xz
ceph-d4d3ee1414e96a7e673dc454153595c1327ed0c2.zip
cmake install ceph-monstore-update-crush.sh into ${CMAKE_INSTALL_LIBDIR}/ceph
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>
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f30c8b4b395..4aed659f42c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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