From 1b3165a18fa5a10294cd89c7e30de17676d70f54 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 2 Mar 2013 18:39:53 -0500 Subject: [PATCH] Bug #1185 - Fixed bug #1185, correcting man page install location for out-of-tree builds (thanks to Jakub Wilk). --- ChangeLog | 2 ++ doc/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01f295025..082ab38d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,8 @@ Bugs package (thanks to Jakub Wilk). + Fixed bug #1183, correcting error message typos (thanks to Jakub Wilk). + Fixed bug #1184, correcting man page formatting (thanks to Jakub Wilk). + + Fixed bug #1185, correcting man page install location for out-of-tree + builds (thanks to Jakub Wilk). + Fixed bug #1189, which caused wide Asian UTF8 characters to be measured as narrow characters (thanks to Roy Zuo). + Improved hyphenation by splitting on commas (even if no whitespace after). diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1a270b137..85a74d77c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -7,9 +7,9 @@ foreach (man_FILE ${man_FILES}) ${CMAKE_CURRENT_SOURCE_DIR}/man/${man_FILE}) endforeach (man_FILE) -install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR} +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${TASK_MAN1DIR} FILES_MATCHING PATTERN "*.1") -install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR} +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${TASK_MAN5DIR} FILES_MATCHING PATTERN "*.5") install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc DESTINATION ${TASK_DOCDIR})