--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -756,7 +756,7 @@ ADD_SUBDIRECTORY(cmake/install) FIND_PACKAGE(UnixCommands) -IF(GZIP) +IF(FALSE) ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND ${GZIP} -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1" @@ -767,7 +767,6 @@ ADD_CUSTOM_TARGET(manpage ALL DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz") ELSEIF(UNIX) - MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz") ENDIF() # install headers @@ -785,7 +784,7 @@ # ADD_CUSTOM_TARGET(distclean COMMAND make clean - COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz) + COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1) # # add tarball-target --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -132,7 +132,7 @@ SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms) ENDIF() -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} lmmsconfig.h lmms.1.gz") +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} lmmsconfig.h lmms.1") IF(LMMS_BUILD_WIN32) SET(EXTRA_LIBRARIES "winmm") @@ -218,7 +218,7 @@ ELSE(CMAKE_INSTALL_MANDIR) SET(INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) ENDIF(CMAKE_INSTALL_MANDIR) - INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" + INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${INSTALL_MANDIR}/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) ENDIF()