]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10357 from SUSE/wip-16748-jewel
authorLoic Dachary <loic@dachary.org>
Wed, 24 Aug 2016 16:51:54 +0000 (18:51 +0200)
committerGitHub <noreply@github.com>
Wed, 24 Aug 2016 16:51:54 +0000 (18:51 +0200)
jewel: mount.ceph: move from ceph-base to ceph-common and add symlink in /sbin for SUSE

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
ceph.spec.in
src/CMakeLists.txt

diff --cc ceph.spec.in
Simple merge
index 21c7dca9605886a37898475f0190764eb437f34a,4641e63ac7103874e70ed71d30fedc417f5d78d9..103e68a14c60ee19205426812cc757d952981b43
@@@ -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)