Move client textures to the correct place

[oweals/minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 514175e9ec69f5b79e775088f7e37bbc11890d8f..9ec8d775707ef141913f5cb14fb1affb904463bd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,14 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
 # This can be read from ${PROJECT_NAME} after project() is called
 project(minetest)
 
+# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110730_rc2)
+set(VERSION_MINOR 4)
+set(VERSION_PATCH dev-20120318)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
+MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")
+
 # Configuration options
 
 if(WIN32)
@@ -46,26 +49,44 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-       set(DATADIR "data")
+       set(SHAREDIR "share")
        set(BINDIR "bin")
        set(DOCDIR "doc")
-       set(EXAMPLE_CONF_DIR ".")
+       set(EXAMPLE_CONF_DIR "user")
 elseif(APPLE)
        # random placeholders
-       set(DATADIR "share/${PROJECT_NAME}")
+       set(SHAREDIR "share/${PROJECT_NAME}")
        set(BINDIR "bin")
        set(DOCDIR "share/doc/${PROJECT_NAME}")
-       set(EXAMPLE_CONF_DIR ".")
+       set(EXAMPLE_CONF_DIR ${DOCDIR})
 elseif(UNIX) # Linux, BSD etc
-       set(DATADIR "share/${PROJECT_NAME}")
-       set(BINDIR "bin")
-       set(DOCDIR "share/doc/${PROJECT_NAME}")
-       set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}")
+       if(RUN_IN_PLACE)
+               set(SHAREDIR "share")
+               set(BINDIR "bin")
+               set(DOCDIR "doc")
+               set(MANDIR "share/unix/man")
+               set(EXAMPLE_CONF_DIR ${DOCDIR})
+               set(XDG_APPS_DIR "share/unix/applications")
+               set(ICONDIR "share/unix/icons")
+       else()
+               set(SHAREDIR "share/${PROJECT_NAME}")
+               set(BINDIR "bin")
+               set(DOCDIR "share/doc/${PROJECT_NAME}")
+               set(MANDIR "share/man")
+               set(EXAMPLE_CONF_DIR ${DOCDIR})
+               set(XDG_APPS_DIR "share/applications")
+               set(ICONDIR "share/icons")
+       endif()
 endif()
 
-install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
-install(FILES "doc/changelog.txt" DESTINATION "${DOCDIR}")
-install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
+
+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