Packaging fixes.

CMakeLists.txt

@@ -55,8 +55,8 @@ if (WIN32)
 		PATTERN "CNAME" EXCLUDE
 	)
 else()
-	install(FILES ${DOC_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}/")
-	install(DIRECTORY docs DESTINATION "${CMAKE_INSTALL_DOCDIR}/"
+	install(FILES ${DOC_FILES} TYPE DOC)
+	install(DIRECTORY docs TYPE DOC
 		PATTERN "*.yml" EXCLUDE
 		PATTERN "CNAME" EXCLUDE
 	)

contrib/CMakeLists.txt

@@ -5,5 +5,6 @@
 ###############################################################################
 
 if (NOT WIN32)
-	install(DIRECTORY "cron-based_noadmin" DESTINATION "${CMAKE_INSTALL_DOCDIR}/contrib/")
+	install(DIRECTORY "${CMAKE_SOURCE_DIR}/contrib" TYPE DOC
+		PATTERN "CMakeLists.txt" EXCLUDE)
 endif()

data/CMakeLists.txt

@@ -49,10 +49,10 @@ if (NOT WIN32)
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/polkit-1/actions/")
 
 	# Man pages
-	install(FILES "gsmartcontrol.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1/")
-	install(FILES "gsmartcontrol.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1/" RENAME "gsmartcontrol-root.1")
+	install(FILES "man1/gsmartcontrol.1" DESTINATION "${CMAKE_INSTALL_MANDIR}")
+	install(FILES "man1/gsmartcontrol.1" DESTINATION "${CMAKE_INSTALL_MANDIR}" RENAME "gsmartcontrol-root.1")
 
 	# Scripts (this goes to bin, not sbin, as it doesn't require root privileges before running)
-	install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol-root.sh" DESTINATION "${CMAKE_INSTALL_BINDIR}" RENAME "gsmartcontrol-root")
+	install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/gsmartcontrol-root.sh" TYPE BIN RENAME "gsmartcontrol-root")
 endif()
 

data/man1/gsmartcontrol.1

@@ -45,9 +45,6 @@ Display version information
 \fB\-\-no\-scan\fP
 Don't scan devices on startup
 .TP
-\fB\-\-no\-hide\-tabs\fP
-Don't hide non\-identity tabs when SMART is disabled. Useful for debugging.
-.TP
 \fB\-\-add\-virtual\fP
 Load smartctl data from file, creating a virtual drive. You
 can specify this option multiple times.

packaging/CMakeLists.txt

@@ -9,7 +9,7 @@ configure_file("nsis/gsmartcontrol.in.nsi" "nsis/gsmartcontrol.nsi" ESCAPE_QUOTE
 
 # NSIS helpers
 if (WIN32)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nsis/distribution.txt" DESTINATION doc/)
+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nsis/distribution.txt" TYPE DOC)
 
 	# nsis file, only for cross-compilation
 	if (NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

packaging/obs_rpm/gsmartcontrol.spec

@@ -59,8 +59,7 @@ on it.
 
 %build
 %cmake \
-	-DAPP_COMPILER_ENABLE_WARNINGS=ON \
-	-DCMAKE_INSTALL_DOCDIR:PATH=%{_defaultdocdir}/gsmartcontrol
+	-DAPP_COMPILER_ENABLE_WARNINGS=ON
 
 %cmake_build
 

src/CMakeLists.txt

@@ -64,7 +64,7 @@ target_link_libraries(gsmartcontrol
 if (WIN32)
 	install(TARGETS gsmartcontrol DESTINATION .)
 else()
-	install(TARGETS gsmartcontrol DESTINATION "${CMAKE_INSTALL_SBINDIR}/")
+	install(TARGETS gsmartcontrol TYPE SBIN)
 endif()