From 19d564dcd16e749108365c6d9dffb15cc83fa1dc Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 14 Dec 2011 07:50:53 +0000 Subject: [PATCH] - fixes for build scripts to use common manpage variable name --- source/g3d_viewer/CMakeLists.txt | 5 +++++ source/glest_game/CMakeLists.txt | 4 ++-- source/glest_map_editor/CMakeLists.txt | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index c2f283cc3..1bfff455f 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -154,6 +154,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") ${TARGET_NAME} DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) + # Installation of the program manpage file + INSTALL(FILES + "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}" + DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) + # Installation of the program config and image files #INSTALL(FILES # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini" diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index dc200963f..438087568 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -255,7 +255,7 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") # Installation of the program manpage file INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/linux/megaglest.6" + "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ELSE() @@ -277,7 +277,7 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") # Installation of the program manpage file INSTALL(FILES - "${PROJECT_SOURCE_DIR}/megaglest.6" + "${PROJECT_SOURCE_DIR}/${TARGET_NAME_MANPAGE}" DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) ENDIF() diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 907eae78b..903a28e92 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -149,6 +149,11 @@ IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "") ${TARGET_NAME} DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH}) + # Installation of the program manpage file + INSTALL(FILES + "${PROJECT_SOURCE_DIR}/mk/linux/${TARGET_NAME_MANPAGE}" + DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH}) + # Installation of the program config and image files #INSTALL(FILES # "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"