From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 8 Jan 2011 15:45:26 +0000 (+0200)
Subject: doc updates; CMake works reasonably well now.
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=d435dedb898c7d268dfea3504a38a2cd9998bdb2;p=zefram%2Fminetest%2Fminetest_engine.git

doc updates; CMake works reasonably well now.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24cb78f3..1ea10268 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,10 +29,32 @@ MESSAGE(STATUS "BUILD_DATE = ${BUILD_DATE}")
 # This is done here so that relative search paths are more reasnable
 find_package(Irrlicht)
 
-# This way the CMakeLists.txt file in src/ is processed
-add_subdirectory(src)
+#
+# Installation
+#
+
+if(WIN32)
+	set(DATADIR "data")
+	set(BINDIR "bin")
+	set(DOCDIR "doc")
+elseif(APPLE)
+	set(DATADIR "share/minetest")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/minetest")
+elseif(UNIX)
+	set(DATADIR "share/minetest")
+	set(BINDIR "bin")
+	set(DOCDIR "share/doc/minetest")
+endif()
+
+install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
 
-install(FILES "doc/README.txt" DESTINATION "share/minetest/doc")
+#
+# Subdirectories
+#
+
+add_subdirectory(src)
 
 # CPack
 
diff --git a/doc/README.txt b/doc/README.txt
index 09e5fea0..7e740399 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -19,6 +19,16 @@ Public servers:
 Controls:
 - See the in-game pause menu
 
+Map directory:
+- Map is stored in a directory, which can be removed to generate a new map.
+- There is na command-line option for it: --map-dir
+- As default, it is located in:
+		../map
+- Otherwise something like this:
+	Windows: C:\Documents and Settings\user\Application Data\minetest\map
+	Linux: ~/.minetest/map
+	OS X: ~/Library/Application Support/map
+
 Configuration file:
 - An optional configuration file can be used. See minetest.conf.example.
 - Path to file can be passed as a parameter to the executable:
@@ -55,6 +65,14 @@ Compiling on GNU/Linux:
 
 	$ minetest
 
+- Install to home directory:
+	$ cd whatever/minetest
+	$ cmake . -DCMAKE_INSTALL_PREFIX=~/minetest_install
+	$ make -j2
+	$ make install
+
+	$ ~/minetest_install/bin/minetest
+
 - For running in the source directory:
 	$ cd whatever/minetest
 	$ cmake . -DRUN_IN_PLACE
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08339527..e55e502f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -161,17 +161,6 @@ endif( UNIX )
 # Installation
 #
 
-if(WIN32)
-	set(DATADIR "data")
-	set(BINDIR "bin")
-elseif(APPLE)
-	set(DATADIR "share/minetest")
-	set(BINDIR "bin")
-elseif(UNIX)
-	set(DATADIR "share/minetest")
-	set(BINDIR "bin")
-endif()
-
 if(BUILD_CLIENT)
 	install(TARGETS minetest DESTINATION ${BINDIR})