cmake: install lib{rgw,cephfs_jni} into ${CMAKE_INSTALL_LIBDIR} not lib

rh and suse distros follows FHS and put amd64 dso libs into lib64 on
amd64 machines. so let's use ${CMAKE_INSTALL_LIBDIR} instead

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bfc21598350430349a46052ead3b6623dccd4f8a..f30c8b4b395619f0f125b6bfc4fce23abea20d24 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1323,7 +1323,7 @@ if(${WITH_KVS})
     key_value_store/cls_kvs.cc)
   add_library(cls_kvs SHARED ${kvs_srcs})
   set_target_properties(cls_kvs PROPERTIES VERSION "1.0.0" SOVERSION "1")
-  install(TARGETS cls_kvs DESTINATION lib/rados-classes)
+  install(TARGETS cls_kvs DESTINATION ${CMAKE_INSTALL_LIBDIR}/rados-classes)
 endif(${WITH_KVS})
 
 if(${WITH_RADOSGW})
@@ -1456,7 +1456,7 @@ if(${WITH_RADOSGW})
   set_target_properties(rgw PROPERTIES OUTPUT_NAME rgw VERSION 2.0.0
     SOVERSION 1)
 
-  install(TARGETS rgw DESTINATION lib)
+  install(TARGETS rgw DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(FILES
     include/rados/librgw.h
     include/rados/rgw_file.h

diff --git a/src/java/native/CMakeLists.txt b/src/java/native/CMakeLists.txt
index 915db486de8416658e11a2091fd993fbbf095612..42c3fdf15e928a03fe6af658f05e271c8f4daa20 100644 (file)
--- a/src/java/native/CMakeLists.txt
+++ b/src/java/native/CMakeLists.txt
@@ -7,4 +7,4 @@ add_dependencies(cephfs_jni jni-header)
 include_directories(${JNI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(cephfs_jni LINK_PRIVATE cephfs common ${EXTRALIBS} ${JNI_LIBRARIES})
 install(TARGETS cephfs_jni
-  DESTINATION lib)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR})