From 05ca47574d72c96240b3cc6b08eb1e51c31af3f2 Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Sun, 8 Nov 2015 22:44:09 +0100
Subject: [PATCH] fix related with 'single install directory' [ci skip]

---
 mk/macosx/bundle_resources/MegaGlest.sh | 2 +-
 source/g3d_viewer/CMakeLists.txt        | 2 +-
 source/glest_game/CMakeLists.txt        | 2 +-
 source/glest_map_editor/CMakeLists.txt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mk/macosx/bundle_resources/MegaGlest.sh b/mk/macosx/bundle_resources/MegaGlest.sh
index 80e133b9..28edec2b 100755
--- a/mk/macosx/bundle_resources/MegaGlest.sh
+++ b/mk/macosx/bundle_resources/MegaGlest.sh
@@ -14,5 +14,5 @@ else
 fi
 export PATH="$binary_dir_path:$PATH"
 
-exec "$binary_dir_path/megaglest"
+exec "$binary_dir_path/megaglest" "$@"
 exit "$?"
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 8e3767fc..c3f3c1f8 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -185,7 +185,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 		        ${TARGET_NAME} 
 		        DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	        IF(EXISTS ${HELP2MAN} AND NOT APPLE)
+	        IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
          		MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")	
 
 		        # Installation of the program manpage file
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index 0b64aa96..b34b859d 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -299,7 +299,7 @@ IF(BUILD_MEGAGLEST)
 		        ${TARGET_NAME} 
 		        DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	        IF(EXISTS ${HELP2MAN})
+	        IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "")
          		MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")	
 
 		        # Installation of the program manpage file
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 6437144e..e1bf4ad0 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -178,7 +178,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
 		        ${TARGET_NAME} 
 		        DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
 
-	        IF(EXISTS ${HELP2MAN} AND NOT APPLE)
+	        IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
          		MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")	
 
 		        # Installation of the program manpage file