mapgen stuff

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5baf03f1299a031f953dc5b446009e58a395775..516778995621b2dbde7cc9a4c5dce994f5d6e85b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110406_0)
+set(VERSION_PATCH 20110618_0_dev)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
@@ -53,13 +53,13 @@ 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}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
 #
@@ -104,7 +104,7 @@ elseif(APPLE)
        set(CPACK_BUNDLE_ICON "")
        set(CPACK_BUNDLE_PLIST "")
        set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/minetest")
-       set(CPACK_GENERATOR BUNDLE)
+       set(CPACK_GENERATOR Bundle)
 else()
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
        set(CPACK_GENERATOR TGZ)