From: Loic Dachary <loic@dachary.org>
Date: Wed, 24 Aug 2016 16:51:54 +0000 (+0200)
Subject: Merge pull request #10357 from SUSE/wip-16748-jewel
X-Git-Tag: v10.2.3~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df71e5740255ffc0a809b2c437ce37826aed11d3;p=ceph.git

Merge pull request #10357 from SUSE/wip-16748-jewel

jewel: mount.ceph: move from ceph-base to ceph-common and add symlink in /sbin for SUSE

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

df71e5740255ffc0a809b2c437ce37826aed11d3
diff --cc src/CMakeLists.txt
index 21c7dca9605,4641e63ac71..103e68a14c6
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -972,9 -972,10 +972,10 @@@ endif(${ENABLE_SHARED}
        ceph_fuse.cc
        client/fuse_ll.cc)
      add_executable(ceph-fuse ${ceph_fuse_srcs})
 -    target_link_libraries(ceph-fuse ${FUSE_LIBRARIES} client global)
 +    target_link_libraries(ceph-fuse ${ALLOC_LIBS} ${FUSE_LIBRARIES} client global)
      set_target_properties(ceph-fuse PROPERTIES COMPILE_FLAGS "-I${FUSE_INCLUDE_DIRS}")
      install(TARGETS ceph-fuse DESTINATION bin)
+     install(PROGRAMS mount.fuse.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
    endif(HAVE_LIBFUSE)
  endif(WITH_LIBCEPHFS)