# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH dev-20111021)
+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} ***")
#
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