| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 280f0d37c642d68bad2a2e49ef437953474d99e6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Wed, 6 Apr 2016 23:15:02 -0700 |
| 4 | Subject: [PATCH] CMakeLists.txt: fix MAN_INSTALL_DIR |
| 5 | |
| 6 | It checks ${CMAKE_INSTALL_PREFIX}/share/man when configure, but it may |
| 7 | not exist when crosscompile, for example, when CMAKE_INSTALL_PREFIX="/", |
| 8 | it is OK, but when CMAKE_INSTALL_PREFIX="/some/path/else", then it |
| 9 | doesn't exist, and the man dir would be set to "/usr/man" which is |
| 10 | incorrect. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 15 | --- |
| 16 | CMakeLists.txt | 5 +---- |
| 17 | 1 file changed, 1 insertion(+), 4 deletions(-) |
| 18 | |
| 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 20 | index fd1426b..747db22 100644 |
| 21 | --- a/CMakeLists.txt |
| 22 | +++ b/CMakeLists.txt |
| 23 | @@ -57,10 +57,7 @@ else (DEFINED INCLUDE) |
| 24 | ENDIF (DEFINED INCLUDE) |
| 25 | MESSAGE (STATUS "Header files will be installed in ${INCLUDE_INSTALL_DIR}") |
| 26 | SET (BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") |
| 27 | -SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man") |
| 28 | -IF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") |
| 29 | - SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") |
| 30 | -ENDIF (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/man" AND NOT IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/man") |
| 31 | +SET (MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/man") |
| 32 | MESSAGE(STATUS "Man pages will be installed in ${MAN_INSTALL_DIR}") |
| 33 | |
| 34 | #################################################################### |
| 35 | -- |
| 36 | 2.7.4 |
| 37 | |