dig_immediate=3 instead of 1 means 0 seconds

[dragonfireclient.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0b5366b972fd93a69513c2a36089081d3372e46..feefa58c478be5e7b0ca8d49cbbbf0267ad7f2b6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ project(minetest)
 
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH dev-20111016)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH dev-20120122-1)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
@@ -63,13 +63,22 @@ elseif(UNIX) # Linux, BSD etc
        set(DATADIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
        set(DOCDIR "share/doc/${PROJECT_NAME}")
+       set(MANDIR "share/man")
        set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
+       set(XDG_APPS_DIR "share/applications")
+       set(ICONDIR "share/icons")
 endif()
 
-install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
+if(UNIX)
+       install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
+       install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+       install(FILES "minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+endif()
+
 #
 # Subdirectories
 # Be sure to add all relevant definitions above this