X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=d5b8028f614561d9c40ded96405d913c28264f4e;hb=dadac0e79f96b112947a50f37b39ad9677e870d0;hp=a0f248d13b9db22defa37c6d27e1372ae1881bc5;hpb=a0e8f3afd3444e4ad7e8647672c51555b74bd218;p=dragonfireclient.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0f248d13..d5b8028f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 project(minetest)
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110424_1_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -45,15 +45,18 @@ if(WIN32)
 	set(DATADIR "data")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
+	set(EXAMPLE_CONF_DIR ".")
 elseif(APPLE)
 	# random placeholders
 	set(DATADIR "share/minetest")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/minetest")
-elseif(UNIX)
-	set(DATADIR "usr/share/minetest")
-	set(BINDIR "usr/bin")
-	set(DOCDIR "usr/share/doc/minetest")
+	set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+	set(DATADIR "share/minetest")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/minetest")
+	set(EXAMPLE_CONF_DIR "share/doc/minetest")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")