commit before some more radical changes

[minetest.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc9d98b368cbd19b95e08e2311582b81b47b3fee..da820dcc190b8283407aaa621ef647cf3336475b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,14 +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 "share/minetest")
-       set(BINDIR "bin")
-       set(DOCDIR "share/doc/minetest")
+       set(EXAMPLE_CONF_DIR ".")
+elseif(UNIX) # Linux, BSD etc
+       set(DATADIR "usr/share/minetest")
+       set(BINDIR "usr/bin")
+       set(DOCDIR "usr/share/doc/minetest")
+       set(EXAMPLE_CONF_DIR "usr/share/doc/minetest")
 endif()
 
 install(FILES "doc/README.txt" DESTINATION "${DOCDIR}")
@@ -76,12 +80,13 @@ set(CPACK_PACKAGE_CONTACT "Perttu Ahola <celeron55@gmail.com>")
 
 if(WIN32)
        # For some reason these aren't copied otherwise
-       if(BUILD_CLIENT)
-               install(FILES bin/minetest.exe DESTINATION bin)
-       endif()
-       if(BUILD_SERVER)
-               install(FILES bin/minetestserver.exe DESTINATION bin)
-       endif()
+       # NOTE: For some reason now it seems to work without these
+       #if(BUILD_CLIENT)
+       #       install(FILES bin/minetest.exe DESTINATION bin)
+       #endif()
+       #if(BUILD_SERVER)
+       #       install(FILES bin/minetestserver.exe DESTINATION bin)
+       #endif()
 
        set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-win32")