updated german po file for minetest-delta (prior it was for minetest)

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0f248d13b9db22defa37c6d27e1372ae1881bc5..15f4a64534c895f4764a112ac3f12fc05824e7a3 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 1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 20110704_0)
 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}")
@@ -101,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)