makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 79cf4c912cb59799fa9f79544c62a38aa5ec2fe6..86733a27c102299463c63666037fe1456c8aeed2 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -713,8 +713,6 @@ install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildro
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
 install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
-mv %{buildroot}/sbin/mount.ceph %{buildroot}/usr/sbin/mount.ceph
-mv %{buildroot}/sbin/mount.fuse.ceph %{buildroot}/usr/sbin/mount.fuse.ceph
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph

diff --git a/debian/ceph-fs-common.install b/debian/ceph-fs-common.install
index b20f66af34423d7a99d3b8f15f1195e0528cd1d2..70f6e949ab1ebb65a3503cc174f1fa96bdcffe9e 100644 (file)
--- a/debian/ceph-fs-common.install
+++ b/debian/ceph-fs-common.install
@@ -1,4 +1,4 @@
-sbin/mount.ceph
+usr/sbin/mount.ceph sbin
 usr/bin/cephfs
 usr/share/man/man8/cephfs.8
 usr/share/man/man8/mount.ceph.8

diff --git a/debian/ceph-fuse.install b/debian/ceph-fuse.install
index c3bcd4993049550fa50ddb8bc8a62c2a6d94451d..364e86393226efefd6ebffcbb5e292251958337f 100644 (file)
--- a/debian/ceph-fuse.install
+++ b/debian/ceph-fuse.install
@@ -1,3 +1,3 @@
-sbin/mount.fuse.ceph
+usr/sbin/mount.fuse.ceph sbin
 usr/bin/ceph-fuse
 usr/share/man/man8/ceph-fuse.8

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7dda69460fccc163027e6705f1a53d9a92dd72d9..7a81415655e016d38e9e9cca9189781f4c33a0f5 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1151,7 +1151,7 @@ endif(BUILD_SHARED_LIBS)
   target_link_libraries(mount.ceph keyutils)
 
   install(TARGETS ceph-syn DESTINATION bin)
-  install(TARGETS mount.ceph DESTINATION /sbin)
+  install(TARGETS mount.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
   if(HAVE_LIBFUSE)
     set(ceph_fuse_srcs
@@ -1161,7 +1161,7 @@ endif(BUILD_SHARED_LIBS)
     target_link_libraries(ceph-fuse ${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 /sbin)
+    install(PROGRAMS mount.fuse.ceph DESTINATION ${CMAKE_INSTALL_SBINDIR})
   endif(HAVE_LIBFUSE)
 endif(WITH_LIBCEPHFS)
 

diff --git a/src/Makefile-server.am b/src/Makefile-server.am
index 1ea73b1c1d65bb100f26bd066dd340b3f33536fc..f75017a524e9fefa0296c4cb59f8917ecbd120c5 100644 (file)
--- a/src/Makefile-server.am
+++ b/src/Makefile-server.am
@@ -19,9 +19,9 @@ shell_scripts += init-ceph
 mount_ceph_SOURCES = mount/mount.ceph.c
 mount_ceph_LDADD = $(LIBSECRET) $(LIBCOMMON)
 if LINUX
-su_sbin_PROGRAMS += mount.ceph
+sbin_PROGRAMS += mount.ceph
 endif # LINUX
-su_sbin_SCRIPTS += mount.fuse.ceph
+sbin_SCRIPTS += mount.fuse.ceph
 
 
 if WITH_MON