Merge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage

makefile: fix rbdmap manpage Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Mar 25, 2016 · e82dd05 · e82dd05
2 parents 1ac8b5f + 3b551e6
commit e82dd05
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
@@ -2,7 +2,6 @@ install(FILES
 	ceph-osd.8
 	ceph-mds.8
 	ceph-mon.8
-	ceph-fuse.8
 	ceph-syn.8
 	crushtool.8
 	osdmaptool.8
@@ -17,16 +16,28 @@ install(FILES
 	ceph-authtool.8
 	rados.8
 	librados-config.8
-	rbd.8
 	ceph-clsinfo.8
 	ceph-debugpack.8
 	cephfs.8
 	ceph-dencoder.8
 	ceph-rest-api.8
-	ceph-rbdnamer.8
 	ceph-post-file.8
+  DESTINATION ${CEPH_MAN_DIR}/man8)
+
+if(HAVE_LIBFUSE)
+  install(FILES
+	ceph-fuse.8
 	rbd-fuse.8
+	DESTINATION ${CEPH_MAN_DIR}/man8)
+endif()
+
+if(WITH_RBD)
+  install(FILES
+	ceph-rbdnamer.8
 	rbd-nbd.8
-	rbd-replay.8
 	rbd-replay-prep.8
-  DESTINATION ${CEPH_MAN_DIR}/man8)
+	rbd-replay.8
+	rbdmap.8
+	rbd.8
+	DESTINATION ${CEPH_MAN_DIR}/man8)
+endif()
diff --git a/man/Makefile-client.am b/man/Makefile-client.am
@@ -20,7 +20,8 @@ dist_man_MANS += \
 	rbd-nbd.8 \
 	rbd-replay.8 \
 	rbd-replay-many.8 \
-	rbd-replay-prep.8
+	rbd-replay-prep.8 \
+	rbdmap.8
 endif
 
 if WITH_CEPHFS