Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h...

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c8c7a18cfd005a1fc69a3d730384efb58101539..9cb6db41f112d44a5860d9596d3e22a9141971b5 100644 (file)
--- 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 2)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110602_1_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -53,10 +53,10 @@ elseif(APPLE)
        set(DOCDIR "share/doc/minetest")
        set(EXAMPLE_CONF_DIR ".")
 elseif(UNIX) # Linux, BSD etc
-       set(DATADIR "usr/share/minetest")
-       set(BINDIR "usr/bin")
-       set(DOCDIR "usr/share/doc/minetest")
-       set(EXAMPLE_CONF_DIR "usr/share/doc/minetest")
+       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}")