Flatten share/ and user/ in the source and for the RUN_IN_PLACE build

.gitignore

@@ -1,6 +1,26 @@
+## Generic ignorable patterns and files
 *~
-map/*
-world/*
+.*.swp
+*bak*
+tags
+*.vim
+
+## Non-static Minetest directories
+bin/
+games/
+!games/mesetint
+cache/
+textures/
+sounds/
+mods/
+worlds/
+world/
+
+## Configuration/log files
+minetest.conf
+debug.txt
+
+## Build files
 CMakeFiles/*
 src/CMakeFiles/*
 src/Makefile
@@ -10,19 +30,13 @@ src/jthread/CMakeFiles/*
 src/jthread/Makefile
 src/jthread/cmake_config.h
 src/jthread/cmake_install.cmake
-.*.swp
-minetest.conf
-bin/
+src/jthread/libjthread.a
+src/lua/build/
+src/lua/CMakeFiles/
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 cmake_install.cmake
-src/jthread/libjthread.a
-debug.txt
-bin/debug.txt
-minetestmapper/map.png
 locale/
-src/lua/build/
-src/lua/CMakeFiles/
-*bak*
+

CMakeLists.txt

@@ -49,25 +49,29 @@ find_package(Irrlicht)
 #
 
 if(WIN32)
-	set(SHAREDIR "share")
+	set(SHAREDIR ".")
 	set(BINDIR "bin")
 	set(DOCDIR "doc")
-	set(EXAMPLE_CONF_DIR "user")
+	set(EXAMPLE_CONF_DIR ".")
+	set(LOCALEDIR "locale")
 elseif(APPLE)
-	# random placeholders
+	# Random placeholders; this isn't usually used and may not work
+	# See https://github.com/toabi/minetest-mac/
 	set(SHAREDIR "share/${PROJECT_NAME}")
 	set(BINDIR "bin")
 	set(DOCDIR "share/doc/${PROJECT_NAME}")
 	set(EXAMPLE_CONF_DIR ${DOCDIR})
+	set(LOCALEDIR "locale")
 elseif(UNIX) # Linux, BSD etc
 	if(RUN_IN_PLACE)
-		set(SHAREDIR "share")
+		set(SHAREDIR ".")
 		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")
+		set(EXAMPLE_CONF_DIR ".")
+		set(MANDIR "unix/man")
+		set(XDG_APPS_DIR "unix/applications")
+		set(ICONDIR "unix/icons")
+		set(LOCALEDIR "locale")
 	else()
 		set(SHAREDIR "share/${PROJECT_NAME}")
 		set(BINDIR "bin")
@@ -76,9 +80,13 @@ elseif(UNIX) # Linux, BSD etc
 		set(EXAMPLE_CONF_DIR ${DOCDIR})
 		set(XDG_APPS_DIR "share/applications")
 		set(ICONDIR "share/icons")
+		set(LOCALEDIR "share/locale")
 	endif()
 endif()
 
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}/")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/mesetint" DESTINATION "${SHAREDIR}/games/")
+
 install(FILES "README.txt" DESTINATION "${DOCDIR}")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 

cmake/Modules/FindGettextLib.cmake

@@ -59,7 +59,7 @@ ENDIF()
 IF(GETTEXT_FOUND)
 	SET(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po)
 	SET(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES)
-	SET(GETTEXT_MO_DEST_PATH ${DATADIR}/../locale/<locale>/LC_MESSAGES)
+	SET(GETTEXT_MO_DEST_PATH ${LOCALEDIR}/<locale>/LC_MESSAGES)
 	FILE(GLOB GETTEXT_AVAILABLE_LOCALES RELATIVE ${GETTEXT_PO_PATH} "${GETTEXT_PO_PATH}/*")
 	LIST(REMOVE_ITEM GETTEXT_AVAILABLE_LOCALES minetest.pot)
 	MACRO(SET_MO_PATHS _buildvar _destvar _locale)