patches from qdii

CMakeLists.txt

@@ -89,9 +89,15 @@ else()
 	# includes lib path which determines where to install shared libraries (either /lib or /lib64)
 	include(GNUInstallDirs)
 
-	set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
-	set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
-	set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files")
+	if (NOT BIN_DIR)
+			set(BIN_DIR "bin" CACHE STRING "Where to install binaries")
+	endif()
+	if (NOT LIB_DIR)
+		set(LIB_DIR "${CMAKE_INSTALL_LIBDIR}/vcmi" CACHE STRING "Where to install main library")
+	endif()
+	if (NOT DATA_DIR)
+		set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files")
+	endif()
 endif()
 
 set (AI_LIB_DIR "${LIB_DIR}/AI")

client/icons/vcmiclient.desktop

@@ -6,4 +6,4 @@ Comment=Open engine for Heroes of Might and Magic 3
 Icon=vcmiclient
 Exec=vcmiclient
 Categories=Game;StrategyGame;
-Version=0.91
+Version=1.0