From f32606854ea90dcfc511c8dcfee285417778452c Mon Sep 17 00:00:00 2001 From: Micke Prag Date: Sun, 17 Jan 2010 14:28:22 +0000 Subject: [PATCH] Merged -r435 from trunk to branches/2.0 --- rfcmd/CMakeLists.txt | 4 +--- tdtool/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rfcmd/CMakeLists.txt b/rfcmd/CMakeLists.txt index 775a2a3f..4b7e4fd1 100644 --- a/rfcmd/CMakeLists.txt +++ b/rfcmd/CMakeLists.txt @@ -57,12 +57,10 @@ IF (UNIX) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating man file rfcmd.1" ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/rfcmd.1 DESTINATION share/man/man1) ENDIF (GENERATE_MAN) ENDIF (UNIX) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/rfcmd.1 DESTINATION share/man/man1) - - #### Project: find_telldus #### IF (BUILD_RFCMD_WITH_LIBFTDI) diff --git a/tdtool/CMakeLists.txt b/tdtool/CMakeLists.txt index 34ab7b19..b35b2144 100644 --- a/tdtool/CMakeLists.txt +++ b/tdtool/CMakeLists.txt @@ -45,8 +45,8 @@ IF (UNIX) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating man file tdtool.1" ) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION share/man/man1) ENDIF (GENERATE_MAN) ENDIF (UNIX) INSTALL(TARGETS tdtool RUNTIME DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tdtool.1 DESTINATION share/man/man1)