import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / build_tools / make_package.sh

diff --git a/ceph/src/rocksdb/build_tools/make_package.sh b/ceph/src/rocksdb/build_tools/make_package.sh
index 7b5c52cff26b7ecb516450c1f80b18726af56356..68a5d8a722825663708fe2684b8765157a640d66 100755 (executable)
--- a/ceph/src/rocksdb/build_tools/make_package.sh
+++ b/ceph/src/rocksdb/build_tools/make_package.sh
@@ -103,31 +103,26 @@ function main() {
   gem_install fpm
 
   make static_lib
-  make install INSTALL_PATH=package
-
-  cd package
-
-  LIB_DIR=lib
-  if [[ -z "$ARCH" ]]; then
-      ARCH=$(getconf LONG_BIT)
-  fi
-  if [[ ("$FPM_OUTPUT" = "rpm") && ($ARCH -eq 64) ]]; then
-      mv lib lib64
-      LIB_DIR=lib64
+  LIBDIR=/usr/lib
+  if [[ $FPM_OUTPUT = "rpm" ]]; then
+      LIBDIR=$(rpm --eval '%_libdir')
   fi
 
+  rm -rf package
+  make install DESTDIR=package PREFIX=/usr LIBDIR=$LIBDIR
+
   fpm \
     -s dir \
     -t $FPM_OUTPUT \
+    -C package \
     -n rocksdb \
     -v $1 \
-    --prefix /usr \
     --url http://rocksdb.org/ \
     -m rocksdb@fb.com \
     --license BSD \
     --vendor Facebook \
     --description "RocksDB is an embeddable persistent key-value store for fast storage." \
-    include $LIB_DIR
+    usr
 }
 
 # shellcheck disable=SC2068