From 5ffb6e3b8969e7c52337ad2992d7d7374d011a13 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 21 Dec 2015 18:20:39 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeModules/nel.cmake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 35680fd08..98b4259e7 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -1035,20 +1035,20 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
   IF(NOT RYZOM_LIB_PREFIX)
     IF(LIBRARY_ARCHITECTURE)
       SET(RYZOM_LIB_PREFIX "lib/${LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
-    ELSE(LIBRARY_ARCHITECTURE)
+    ELSE()
       SET(RYZOM_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
-    ENDIF(LIBRARY_ARCHITECTURE)
+    ENDIF()
   ENDIF(NOT RYZOM_LIB_PREFIX)
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_LIB_PREFIX RYZOM_LIB_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/games path.
   IF(NOT RYZOM_GAMES_PREFIX)
-    IF(WIN32)
-      SET(RYZOM_GAMES_PREFIX "." CACHE PATH "Installation path for tools and applications.")
-    ELSE(WIN32)
+    IF(WITH_UNIX_STRUCTURE)
       SET(RYZOM_GAMES_PREFIX "games" CACHE PATH "Installation path for client.")
-    ENDIF(WIN32)
-  ENDIF(NOT RYZOM_GAMES_PREFIX)
+    ELSE()
+      SET(RYZOM_GAMES_PREFIX "." CACHE PATH "Installation path for tools and applications.")
+    ENDIF()
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_GAMES_PREFIX RYZOM_GAMES_ABSOLUTE_PREFIX)
 
 ENDMACRO(RYZOM_SETUP_PREFIX_PATHS)