122 files changed, 57 insertions, 43 deletions

diff --git a/.gitignore b/.gitignore
index 1d89854f7..c386b77be 100644
--- a/.gitignore
+++ b/.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*
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ec8d7757..01d03a574 100644
--- a/CMakeLists.txt
+++ b/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}")
 
diff --git a/share/builtin/builtin.lua b/builtin/builtin.lua
index 9b2bed33f..9b2bed33f 100644
--- a/share/builtin/builtin.lua
+++ b/builtin/builtin.lua
diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index 5779b6b64..bc7ea367f 100644
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/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)
diff --git a/share/games/mesetint/mods/bucket/depends.txt b/games/mesetint/mods/bucket/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/games/mesetint/mods/bucket/depends.txt
+++ b/games/mesetint/mods/bucket/depends.txt
diff --git a/share/games/mesetint/mods/bucket/init.lua b/games/mesetint/mods/bucket/init.lua
index 8ed9da522..8ed9da522 100644
--- a/share/games/mesetint/mods/bucket/init.lua
+++ b/games/mesetint/mods/bucket/init.lua
diff --git a/share/games/mesetint/mods/bucket/textures/bucket.png b/games/mesetint/mods/bucket/textures/bucket.png
index f165fd209..f165fd209 100644
--- a/share/games/mesetint/mods/bucket/textures/bucket.png
+++ b/games/mesetint/mods/bucket/textures/bucket.png
diff --git a/share/games/mesetint/mods/bucket/textures/bucket_lava.png b/games/mesetint/mods/bucket/textures/bucket_lava.png
index 7cf27cd1f..7cf27cd1f 100644
--- a/share/games/mesetint/mods/bucket/textures/bucket_lava.png
+++ b/games/mesetint/mods/bucket/textures/bucket_lava.png
diff --git a/share/games/mesetint/mods/bucket/textures/bucket_water.png b/games/mesetint/mods/bucket/textures/bucket_water.png
index f220ec51e..f220ec51e 100644
--- a/share/games/mesetint/mods/bucket/textures/bucket_water.png
+++ b/games/mesetint/mods/bucket/textures/bucket_water.png
diff --git a/share/games/mesetint/mods/default/init.lua b/games/mesetint/mods/default/init.lua
index 7823db6b9..7823db6b9 100644
--- a/share/games/mesetint/mods/default/init.lua
+++ b/games/mesetint/mods/default/init.lua
diff --git a/share/games/mesetint/mods/default/textures/crack.png b/games/mesetint/mods/default/textures/crack.png
index 499783982..499783982 100644
--- a/share/games/mesetint/mods/default/textures/crack.png
+++ b/games/mesetint/mods/default/textures/crack.png
diff --git a/share/games/mesetint/mods/default/textures/default_apple.png b/games/mesetint/mods/default/textures/default_apple.png
index 9593f28f6..9593f28f6 100644
--- a/share/games/mesetint/mods/default/textures/default_apple.png
+++ b/games/mesetint/mods/default/textures/default_apple.png
diff --git a/share/games/mesetint/mods/default/textures/default_book.png b/games/mesetint/mods/default/textures/default_book.png
index 176fb6aa9..176fb6aa9 100644
--- a/share/games/mesetint/mods/default/textures/default_book.png
+++ b/games/mesetint/mods/default/textures/default_book.png
diff --git a/share/games/mesetint/mods/default/textures/default_bookshelf.png b/games/mesetint/mods/default/textures/default_bookshelf.png
index 5ecc50ff3..5ecc50ff3 100644
--- a/share/games/mesetint/mods/default/textures/default_bookshelf.png
+++ b/games/mesetint/mods/default/textures/default_bookshelf.png
diff --git a/share/games/mesetint/mods/default/textures/default_brick.png b/games/mesetint/mods/default/textures/default_brick.png
index 32d77f347..32d77f347 100644
--- a/share/games/mesetint/mods/default/textures/default_brick.png
+++ b/games/mesetint/mods/default/textures/default_brick.png
diff --git a/share/games/mesetint/mods/default/textures/default_cactus_side.png b/games/mesetint/mods/default/textures/default_cactus_side.png
index fc479fde6..fc479fde6 100644
--- a/share/games/mesetint/mods/default/textures/default_cactus_side.png
+++ b/games/mesetint/mods/default/textures/default_cactus_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_cactus_top.png b/games/mesetint/mods/default/textures/default_cactus_top.png
index f9e68df51..f9e68df51 100644
--- a/share/games/mesetint/mods/default/textures/default_cactus_top.png
+++ b/games/mesetint/mods/default/textures/default_cactus_top.png
diff --git a/share/games/mesetint/mods/default/textures/default_chest_front.png b/games/mesetint/mods/default/textures/default_chest_front.png
index c5628af94..c5628af94 100644
--- a/share/games/mesetint/mods/default/textures/default_chest_front.png
+++ b/games/mesetint/mods/default/textures/default_chest_front.png
diff --git a/share/games/mesetint/mods/default/textures/default_chest_lock.png b/games/mesetint/mods/default/textures/default_chest_lock.png
index ae038fae5..ae038fae5 100644
--- a/share/games/mesetint/mods/default/textures/default_chest_lock.png
+++ b/games/mesetint/mods/default/textures/default_chest_lock.png
diff --git a/share/games/mesetint/mods/default/textures/default_chest_side.png b/games/mesetint/mods/default/textures/default_chest_side.png
index 916dd784d..916dd784d 100644
--- a/share/games/mesetint/mods/default/textures/default_chest_side.png
+++ b/games/mesetint/mods/default/textures/default_chest_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_chest_top.png b/games/mesetint/mods/default/textures/default_chest_top.png
index 58c79674d..58c79674d 100644
--- a/share/games/mesetint/mods/default/textures/default_chest_top.png
+++ b/games/mesetint/mods/default/textures/default_chest_top.png
diff --git a/share/games/mesetint/mods/default/textures/default_clay.png b/games/mesetint/mods/default/textures/default_clay.png
index 3557429d8..3557429d8 100644
--- a/share/games/mesetint/mods/default/textures/default_clay.png
+++ b/games/mesetint/mods/default/textures/default_clay.png
diff --git a/share/games/mesetint/mods/default/textures/default_clay_brick.png b/games/mesetint/mods/default/textures/default_clay_brick.png
index e36648e48..e36648e48 100644
--- a/share/games/mesetint/mods/default/textures/default_clay_brick.png
+++ b/games/mesetint/mods/default/textures/default_clay_brick.png
diff --git a/share/games/mesetint/mods/default/textures/default_clay_lump.png b/games/mesetint/mods/default/textures/default_clay_lump.png
index be0bab9d7..be0bab9d7 100644
--- a/share/games/mesetint/mods/default/textures/default_clay_lump.png
+++ b/games/mesetint/mods/default/textures/default_clay_lump.png
diff --git a/share/games/mesetint/mods/default/textures/default_cloud.png b/games/mesetint/mods/default/textures/default_cloud.png
index 24091a377..24091a377 100644
--- a/share/games/mesetint/mods/default/textures/default_cloud.png
+++ b/games/mesetint/mods/default/textures/default_cloud.png
diff --git a/share/games/mesetint/mods/default/textures/default_coal_lump.png b/games/mesetint/mods/default/textures/default_coal_lump.png
index bad901efa..bad901efa 100644
--- a/share/games/mesetint/mods/default/textures/default_coal_lump.png
+++ b/games/mesetint/mods/default/textures/default_coal_lump.png
diff --git a/share/games/mesetint/mods/default/textures/default_cobble.png b/games/mesetint/mods/default/textures/default_cobble.png
index 7d0447419..7d0447419 100644
--- a/share/games/mesetint/mods/default/textures/default_cobble.png
+++ b/games/mesetint/mods/default/textures/default_cobble.png
diff --git a/share/games/mesetint/mods/default/textures/default_dirt.png b/games/mesetint/mods/default/textures/default_dirt.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/share/games/mesetint/mods/default/textures/default_dirt.png
+++ b/games/mesetint/mods/default/textures/default_dirt.png
diff --git a/share/games/mesetint/mods/default/textures/default_fence.png b/games/mesetint/mods/default/textures/default_fence.png
index 0b99f0eb5..0b99f0eb5 100644
--- a/share/games/mesetint/mods/default/textures/default_fence.png
+++ b/games/mesetint/mods/default/textures/default_fence.png
diff --git a/share/games/mesetint/mods/default/textures/default_furnace_front.png b/games/mesetint/mods/default/textures/default_furnace_front.png
index 1620a27c3..1620a27c3 100644
--- a/share/games/mesetint/mods/default/textures/default_furnace_front.png
+++ b/games/mesetint/mods/default/textures/default_furnace_front.png
diff --git a/share/games/mesetint/mods/default/textures/default_furnace_side.png b/games/mesetint/mods/default/textures/default_furnace_side.png
index 63cb162fe..63cb162fe 100644
--- a/share/games/mesetint/mods/default/textures/default_furnace_side.png
+++ b/games/mesetint/mods/default/textures/default_furnace_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_glass.png b/games/mesetint/mods/default/textures/default_glass.png
index ade0196fe..ade0196fe 100644
--- a/share/games/mesetint/mods/default/textures/default_glass.png
+++ b/games/mesetint/mods/default/textures/default_glass.png
diff --git a/share/games/mesetint/mods/default/textures/default_grass.png b/games/mesetint/mods/default/textures/default_grass.png
index 3610bb2bc..3610bb2bc 100644
--- a/share/games/mesetint/mods/default/textures/default_grass.png
+++ b/games/mesetint/mods/default/textures/default_grass.png
diff --git a/share/games/mesetint/mods/default/textures/default_grass_footsteps.png b/games/mesetint/mods/default/textures/default_grass_footsteps.png
index 57e063d8c..57e063d8c 100644
--- a/share/games/mesetint/mods/default/textures/default_grass_footsteps.png
+++ b/games/mesetint/mods/default/textures/default_grass_footsteps.png
diff --git a/share/games/mesetint/mods/default/textures/default_grass_side.png b/games/mesetint/mods/default/textures/default_grass_side.png
index 4f4f680be..4f4f680be 100644
--- a/share/games/mesetint/mods/default/textures/default_grass_side.png
+++ b/games/mesetint/mods/default/textures/default_grass_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_gravel.png b/games/mesetint/mods/default/textures/default_gravel.png
index f08666ad9..f08666ad9 100644
--- a/share/games/mesetint/mods/default/textures/default_gravel.png
+++ b/games/mesetint/mods/default/textures/default_gravel.png
diff --git a/share/games/mesetint/mods/default/textures/default_iron_lump.png b/games/mesetint/mods/default/textures/default_iron_lump.png
index edb931018..edb931018 100644
--- a/share/games/mesetint/mods/default/textures/default_iron_lump.png
+++ b/games/mesetint/mods/default/textures/default_iron_lump.png
diff --git a/share/games/mesetint/mods/default/textures/default_junglegrass.png b/games/mesetint/mods/default/textures/default_junglegrass.png
index eea87c07c..eea87c07c 100644
--- a/share/games/mesetint/mods/default/textures/default_junglegrass.png
+++ b/games/mesetint/mods/default/textures/default_junglegrass.png
diff --git a/share/games/mesetint/mods/default/textures/default_jungletree.png b/games/mesetint/mods/default/textures/default_jungletree.png
index ccd20ac74..ccd20ac74 100644
--- a/share/games/mesetint/mods/default/textures/default_jungletree.png
+++ b/games/mesetint/mods/default/textures/default_jungletree.png
diff --git a/share/games/mesetint/mods/default/textures/default_jungletree_top.png b/games/mesetint/mods/default/textures/default_jungletree_top.png
index 2a9b51373..2a9b51373 100644
--- a/share/games/mesetint/mods/default/textures/default_jungletree_top.png
+++ b/games/mesetint/mods/default/textures/default_jungletree_top.png
diff --git a/share/games/mesetint/mods/default/textures/default_ladder.png b/games/mesetint/mods/default/textures/default_ladder.png
index 11056359d..11056359d 100644
--- a/share/games/mesetint/mods/default/textures/default_ladder.png
+++ b/games/mesetint/mods/default/textures/default_ladder.png
diff --git a/share/games/mesetint/mods/default/textures/default_lava.png b/games/mesetint/mods/default/textures/default_lava.png
index cb02ada13..cb02ada13 100644
--- a/share/games/mesetint/mods/default/textures/default_lava.png
+++ b/games/mesetint/mods/default/textures/default_lava.png
diff --git a/share/games/mesetint/mods/default/textures/default_leaves.png b/games/mesetint/mods/default/textures/default_leaves.png
index 7a25126e9..7a25126e9 100644
--- a/share/games/mesetint/mods/default/textures/default_leaves.png
+++ b/games/mesetint/mods/default/textures/default_leaves.png
diff --git a/share/games/mesetint/mods/default/textures/default_mese.png b/games/mesetint/mods/default/textures/default_mese.png
index 4c876cdc5..4c876cdc5 100644
--- a/share/games/mesetint/mods/default/textures/default_mese.png
+++ b/games/mesetint/mods/default/textures/default_mese.png
diff --git a/share/games/mesetint/mods/default/textures/default_mineral_coal.png b/games/mesetint/mods/default/textures/default_mineral_coal.png
index 3ff9692fb..3ff9692fb 100644
--- a/share/games/mesetint/mods/default/textures/default_mineral_coal.png
+++ b/games/mesetint/mods/default/textures/default_mineral_coal.png
diff --git a/share/games/mesetint/mods/default/textures/default_mineral_iron.png b/games/mesetint/mods/default/textures/default_mineral_iron.png
index 51b15d95d..51b15d95d 100644
--- a/share/games/mesetint/mods/default/textures/default_mineral_iron.png
+++ b/games/mesetint/mods/default/textures/default_mineral_iron.png
diff --git a/share/games/mesetint/mods/default/textures/default_mossycobble.png b/games/mesetint/mods/default/textures/default_mossycobble.png
index fad1b33ff..fad1b33ff 100644
--- a/share/games/mesetint/mods/default/textures/default_mossycobble.png
+++ b/games/mesetint/mods/default/textures/default_mossycobble.png
diff --git a/share/games/mesetint/mods/default/textures/default_nc_back.png b/games/mesetint/mods/default/textures/default_nc_back.png
index f09f41658..f09f41658 100644
--- a/share/games/mesetint/mods/default/textures/default_nc_back.png
+++ b/games/mesetint/mods/default/textures/default_nc_back.png
diff --git a/share/games/mesetint/mods/default/textures/default_nc_front.png b/games/mesetint/mods/default/textures/default_nc_front.png
index cad9edab1..cad9edab1 100644
--- a/share/games/mesetint/mods/default/textures/default_nc_front.png
+++ b/games/mesetint/mods/default/textures/default_nc_front.png
diff --git a/share/games/mesetint/mods/default/textures/default_nc_rb.png b/games/mesetint/mods/default/textures/default_nc_rb.png
index 7ebc9930d..7ebc9930d 100644
--- a/share/games/mesetint/mods/default/textures/default_nc_rb.png
+++ b/games/mesetint/mods/default/textures/default_nc_rb.png
diff --git a/share/games/mesetint/mods/default/textures/default_nc_side.png b/games/mesetint/mods/default/textures/default_nc_side.png
index f954045fb..f954045fb 100644
--- a/share/games/mesetint/mods/default/textures/default_nc_side.png
+++ b/games/mesetint/mods/default/textures/default_nc_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_paper.png b/games/mesetint/mods/default/textures/default_paper.png
index ae5c06bc6..ae5c06bc6 100644
--- a/share/games/mesetint/mods/default/textures/default_paper.png
+++ b/games/mesetint/mods/default/textures/default_paper.png
diff --git a/share/games/mesetint/mods/default/textures/default_papyrus.png b/games/mesetint/mods/default/textures/default_papyrus.png
index bf0dec7fe..bf0dec7fe 100644
--- a/share/games/mesetint/mods/default/textures/default_papyrus.png
+++ b/games/mesetint/mods/default/textures/default_papyrus.png
diff --git a/share/games/mesetint/mods/default/textures/default_rail.png b/games/mesetint/mods/default/textures/default_rail.png
index 18176d9f3..18176d9f3 100644
--- a/share/games/mesetint/mods/default/textures/default_rail.png
+++ b/games/mesetint/mods/default/textures/default_rail.png
diff --git a/share/games/mesetint/mods/default/textures/default_rail_crossing.png b/games/mesetint/mods/default/textures/default_rail_crossing.png
index 984640577..984640577 100644
--- a/share/games/mesetint/mods/default/textures/default_rail_crossing.png
+++ b/games/mesetint/mods/default/textures/default_rail_crossing.png
diff --git a/share/games/mesetint/mods/default/textures/default_rail_curved.png b/games/mesetint/mods/default/textures/default_rail_curved.png
index 62afa3d2b..62afa3d2b 100644
--- a/share/games/mesetint/mods/default/textures/default_rail_curved.png
+++ b/games/mesetint/mods/default/textures/default_rail_curved.png
diff --git a/share/games/mesetint/mods/default/textures/default_rail_t_junction.png b/games/mesetint/mods/default/textures/default_rail_t_junction.png
index 9985f63cd..9985f63cd 100644
--- a/share/games/mesetint/mods/default/textures/default_rail_t_junction.png
+++ b/games/mesetint/mods/default/textures/default_rail_t_junction.png
diff --git a/share/games/mesetint/mods/default/textures/default_sand.png b/games/mesetint/mods/default/textures/default_sand.png
index 15101a7eb..15101a7eb 100644
--- a/share/games/mesetint/mods/default/textures/default_sand.png
+++ b/games/mesetint/mods/default/textures/default_sand.png
diff --git a/share/games/mesetint/mods/default/textures/default_sandstone.png b/games/mesetint/mods/default/textures/default_sandstone.png
index c4759b4d0..c4759b4d0 100644
--- a/share/games/mesetint/mods/default/textures/default_sandstone.png
+++ b/games/mesetint/mods/default/textures/default_sandstone.png
diff --git a/share/games/mesetint/mods/default/textures/default_sapling.png b/games/mesetint/mods/default/textures/default_sapling.png
index 73f502306..73f502306 100644
--- a/share/games/mesetint/mods/default/textures/default_sapling.png
+++ b/games/mesetint/mods/default/textures/default_sapling.png
diff --git a/share/games/mesetint/mods/default/textures/default_scorched_stuff.png b/games/mesetint/mods/default/textures/default_scorched_stuff.png
index 9ced2fbe8..9ced2fbe8 100644
--- a/share/games/mesetint/mods/default/textures/default_scorched_stuff.png
+++ b/games/mesetint/mods/default/textures/default_scorched_stuff.png
diff --git a/share/games/mesetint/mods/default/textures/default_sign_wall.png b/games/mesetint/mods/default/textures/default_sign_wall.png
index 06eac1ee9..06eac1ee9 100644
--- a/share/games/mesetint/mods/default/textures/default_sign_wall.png
+++ b/games/mesetint/mods/default/textures/default_sign_wall.png
diff --git a/share/games/mesetint/mods/default/textures/default_steel_block.png b/games/mesetint/mods/default/textures/default_steel_block.png
index 8e2020081..8e2020081 100644
--- a/share/games/mesetint/mods/default/textures/default_steel_block.png
+++ b/games/mesetint/mods/default/textures/default_steel_block.png
diff --git a/share/games/mesetint/mods/default/textures/default_steel_ingot.png b/games/mesetint/mods/default/textures/default_steel_ingot.png
index f6c9414e7..f6c9414e7 100644
--- a/share/games/mesetint/mods/default/textures/default_steel_ingot.png
+++ b/games/mesetint/mods/default/textures/default_steel_ingot.png
diff --git a/share/games/mesetint/mods/default/textures/default_stick.png b/games/mesetint/mods/default/textures/default_stick.png
index 2d31797f0..2d31797f0 100644
--- a/share/games/mesetint/mods/default/textures/default_stick.png
+++ b/games/mesetint/mods/default/textures/default_stick.png
diff --git a/share/games/mesetint/mods/default/textures/default_stone.png b/games/mesetint/mods/default/textures/default_stone.png
index cad0dbe2b..cad0dbe2b 100644
--- a/share/games/mesetint/mods/default/textures/default_stone.png
+++ b/games/mesetint/mods/default/textures/default_stone.png
diff --git a/share/games/mesetint/mods/default/textures/default_tnt_bottom.png b/games/mesetint/mods/default/textures/default_tnt_bottom.png
index 8ba2fca0b..8ba2fca0b 100644
--- a/share/games/mesetint/mods/default/textures/default_tnt_bottom.png
+++ b/games/mesetint/mods/default/textures/default_tnt_bottom.png
diff --git a/share/games/mesetint/mods/default/textures/default_tnt_side.png b/games/mesetint/mods/default/textures/default_tnt_side.png
index d9a2bc4eb..d9a2bc4eb 100644
--- a/share/games/mesetint/mods/default/textures/default_tnt_side.png
+++ b/games/mesetint/mods/default/textures/default_tnt_side.png
diff --git a/share/games/mesetint/mods/default/textures/default_tnt_top.png b/games/mesetint/mods/default/textures/default_tnt_top.png
index a84ffc9af..a84ffc9af 100644
--- a/share/games/mesetint/mods/default/textures/default_tnt_top.png
+++ b/games/mesetint/mods/default/textures/default_tnt_top.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_mesepick.png b/games/mesetint/mods/default/textures/default_tool_mesepick.png
index a1f3812e0..a1f3812e0 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_mesepick.png
+++ b/games/mesetint/mods/default/textures/default_tool_mesepick.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelaxe.png b/games/mesetint/mods/default/textures/default_tool_steelaxe.png
index 0ad23c93b..0ad23c93b 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_steelaxe.png
+++ b/games/mesetint/mods/default/textures/default_tool_steelaxe.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelpick.png b/games/mesetint/mods/default/textures/default_tool_steelpick.png
index 7982dafeb..7982dafeb 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_steelpick.png
+++ b/games/mesetint/mods/default/textures/default_tool_steelpick.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelshovel.png b/games/mesetint/mods/default/textures/default_tool_steelshovel.png
index ed8413846..ed8413846 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_steelshovel.png
+++ b/games/mesetint/mods/default/textures/default_tool_steelshovel.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_steelsword.png b/games/mesetint/mods/default/textures/default_tool_steelsword.png
index a74581238..a74581238 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_steelsword.png
+++ b/games/mesetint/mods/default/textures/default_tool_steelsword.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png b/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
index 698ac918f..698ac918f 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
+++ b/games/mesetint/mods/default/textures/default_tool_stoneaxe.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_stonepick.png b/games/mesetint/mods/default/textures/default_tool_stonepick.png
index b34de6f32..b34de6f32 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_stonepick.png
+++ b/games/mesetint/mods/default/textures/default_tool_stonepick.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png b/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
index ba5243101..ba5243101 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
+++ b/games/mesetint/mods/default/textures/default_tool_stoneshovel.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_stonesword.png b/games/mesetint/mods/default/textures/default_tool_stonesword.png
index 8f8191f92..8f8191f92 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_stonesword.png
+++ b/games/mesetint/mods/default/textures/default_tool_stonesword.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodaxe.png b/games/mesetint/mods/default/textures/default_tool_woodaxe.png
index 3daa4af72..3daa4af72 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_woodaxe.png
+++ b/games/mesetint/mods/default/textures/default_tool_woodaxe.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodpick.png b/games/mesetint/mods/default/textures/default_tool_woodpick.png
index ea728cca3..ea728cca3 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_woodpick.png
+++ b/games/mesetint/mods/default/textures/default_tool_woodpick.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodshovel.png b/games/mesetint/mods/default/textures/default_tool_woodshovel.png
index 649ab4c38..649ab4c38 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_woodshovel.png
+++ b/games/mesetint/mods/default/textures/default_tool_woodshovel.png
diff --git a/share/games/mesetint/mods/default/textures/default_tool_woodsword.png b/games/mesetint/mods/default/textures/default_tool_woodsword.png
index d6c6be325..d6c6be325 100644
--- a/share/games/mesetint/mods/default/textures/default_tool_woodsword.png
+++ b/games/mesetint/mods/default/textures/default_tool_woodsword.png
diff --git a/share/games/mesetint/mods/default/textures/default_torch.png b/games/mesetint/mods/default/textures/default_torch.png
index 7a953c222..7a953c222 100644
--- a/share/games/mesetint/mods/default/textures/default_torch.png
+++ b/games/mesetint/mods/default/textures/default_torch.png
diff --git a/share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png b/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
index 6965d380e..6965d380e 100644
--- a/share/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
+++ b/games/mesetint/mods/default/textures/default_torch_on_ceiling.png
diff --git a/share/games/mesetint/mods/default/textures/default_torch_on_floor.png b/games/mesetint/mods/default/textures/default_torch_on_floor.png
index 76d1dd5ac..76d1dd5ac 100644
--- a/share/games/mesetint/mods/default/textures/default_torch_on_floor.png
+++ b/games/mesetint/mods/default/textures/default_torch_on_floor.png
diff --git a/share/games/mesetint/mods/default/textures/default_tree.png b/games/mesetint/mods/default/textures/default_tree.png
index 65abfc243..65abfc243 100644
--- a/share/games/mesetint/mods/default/textures/default_tree.png
+++ b/games/mesetint/mods/default/textures/default_tree.png
diff --git a/share/games/mesetint/mods/default/textures/default_tree_top.png b/games/mesetint/mods/default/textures/default_tree_top.png
index 2cdd94f80..2cdd94f80 100644
--- a/share/games/mesetint/mods/default/textures/default_tree_top.png
+++ b/games/mesetint/mods/default/textures/default_tree_top.png
diff --git a/share/games/mesetint/mods/default/textures/default_water.png b/games/mesetint/mods/default/textures/default_water.png
index e5f8cdc25..e5f8cdc25 100644
--- a/share/games/mesetint/mods/default/textures/default_water.png
+++ b/games/mesetint/mods/default/textures/default_water.png
diff --git a/share/games/mesetint/mods/default/textures/default_wood.png b/games/mesetint/mods/default/textures/default_wood.png
index 57c1d7c12..57c1d7c12 100644
--- a/share/games/mesetint/mods/default/textures/default_wood.png
+++ b/games/mesetint/mods/default/textures/default_wood.png
diff --git a/share/games/mesetint/mods/default/textures/heart.png b/games/mesetint/mods/default/textures/heart.png
index 6bc183e04..6bc183e04 100644
--- a/share/games/mesetint/mods/default/textures/heart.png
+++ b/games/mesetint/mods/default/textures/heart.png
diff --git a/share/games/mesetint/mods/default/textures/player.png b/games/mesetint/mods/default/textures/player.png
index 90adf9747..90adf9747 100644
--- a/share/games/mesetint/mods/default/textures/player.png
+++ b/games/mesetint/mods/default/textures/player.png
diff --git a/share/games/mesetint/mods/default/textures/player_back.png b/games/mesetint/mods/default/textures/player_back.png
index 530aa7519..530aa7519 100644
--- a/share/games/mesetint/mods/default/textures/player_back.png
+++ b/games/mesetint/mods/default/textures/player_back.png
diff --git a/share/games/mesetint/mods/default/textures/treeprop.png b/games/mesetint/mods/default/textures/treeprop.png
index 77ea4d6d4..77ea4d6d4 100644
--- a/share/games/mesetint/mods/default/textures/treeprop.png
+++ b/games/mesetint/mods/default/textures/treeprop.png
diff --git a/share/games/mesetint/mods/default/textures/wieldhand.png b/games/mesetint/mods/default/textures/wieldhand.png
index c4549e5ed..c4549e5ed 100644
--- a/share/games/mesetint/mods/default/textures/wieldhand.png
+++ b/games/mesetint/mods/default/textures/wieldhand.png
diff --git a/share/games/mesetint/mods/experimental/depends.txt b/games/mesetint/mods/experimental/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/games/mesetint/mods/experimental/depends.txt
+++ b/games/mesetint/mods/experimental/depends.txt
diff --git a/share/games/mesetint/mods/experimental/init.lua b/games/mesetint/mods/experimental/init.lua
index 364eeb10c..364eeb10c 100644
--- a/share/games/mesetint/mods/experimental/init.lua
+++ b/games/mesetint/mods/experimental/init.lua
diff --git a/share/games/mesetint/mods/experimental/textures/experimental_dummyball.png b/games/mesetint/mods/experimental/textures/experimental_dummyball.png
index 084676552..084676552 100644
--- a/share/games/mesetint/mods/experimental/textures/experimental_dummyball.png
+++ b/games/mesetint/mods/experimental/textures/experimental_dummyball.png
diff --git a/share/games/mesetint/mods/give_initial_stuff/depends.txt b/games/mesetint/mods/give_initial_stuff/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/games/mesetint/mods/give_initial_stuff/depends.txt
+++ b/games/mesetint/mods/give_initial_stuff/depends.txt
diff --git a/share/games/mesetint/mods/give_initial_stuff/init.lua b/games/mesetint/mods/give_initial_stuff/init.lua
index 9cf6b51b5..9cf6b51b5 100644
--- a/share/games/mesetint/mods/give_initial_stuff/init.lua
+++ b/games/mesetint/mods/give_initial_stuff/init.lua
diff --git a/share/games/mesetint/mods/legacy/depends.txt b/games/mesetint/mods/legacy/depends.txt
index 3a7daa1d7..3a7daa1d7 100644
--- a/share/games/mesetint/mods/legacy/depends.txt
+++ b/games/mesetint/mods/legacy/depends.txt
diff --git a/share/games/mesetint/mods/legacy/init.lua b/games/mesetint/mods/legacy/init.lua
index 7f9088ce0..7f9088ce0 100644
--- a/share/games/mesetint/mods/legacy/init.lua
+++ b/games/mesetint/mods/legacy/init.lua
diff --git a/share/games/mesetint/mods/legacy/textures/apple_iron.png b/games/mesetint/mods/legacy/textures/apple_iron.png
index 2dffdf014..2dffdf014 100644
--- a/share/games/mesetint/mods/legacy/textures/apple_iron.png
+++ b/games/mesetint/mods/legacy/textures/apple_iron.png
diff --git a/share/games/mesetint/mods/legacy/textures/cooked_rat.png b/games/mesetint/mods/legacy/textures/cooked_rat.png
index daad3be0d..daad3be0d 100644
--- a/share/games/mesetint/mods/legacy/textures/cooked_rat.png
+++ b/games/mesetint/mods/legacy/textures/cooked_rat.png
diff --git a/share/games/mesetint/mods/legacy/textures/dungeon_master.png b/games/mesetint/mods/legacy/textures/dungeon_master.png
index 3457c8228..3457c8228 100644
--- a/share/games/mesetint/mods/legacy/textures/dungeon_master.png
+++ b/games/mesetint/mods/legacy/textures/dungeon_master.png
diff --git a/share/games/mesetint/mods/legacy/textures/fireball.png b/games/mesetint/mods/legacy/textures/fireball.png
index 523142850..523142850 100644
--- a/share/games/mesetint/mods/legacy/textures/fireball.png
+++ b/games/mesetint/mods/legacy/textures/fireball.png
diff --git a/share/games/mesetint/mods/legacy/textures/firefly.png b/games/mesetint/mods/legacy/textures/firefly.png
index 40df7fa1c..40df7fa1c 100644
--- a/share/games/mesetint/mods/legacy/textures/firefly.png
+++ b/games/mesetint/mods/legacy/textures/firefly.png
diff --git a/share/games/mesetint/mods/legacy/textures/oerkki1.png b/games/mesetint/mods/legacy/textures/oerkki1.png
index 33cbac9e7..33cbac9e7 100644
--- a/share/games/mesetint/mods/legacy/textures/oerkki1.png
+++ b/games/mesetint/mods/legacy/textures/oerkki1.png
diff --git a/share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png b/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
index 9b777387c..9b777387c 100644
--- a/share/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
+++ b/games/mesetint/mods/legacy/textures/oerkki1_damaged.png
diff --git a/share/games/mesetint/mods/legacy/textures/rat.png b/games/mesetint/mods/legacy/textures/rat.png
index d1a0e2ae2..d1a0e2ae2 100644
--- a/share/games/mesetint/mods/legacy/textures/rat.png
+++ b/games/mesetint/mods/legacy/textures/rat.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 448f2f6b8..16ab45c5c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -313,7 +313,8 @@ endif()
 if(BUILD_CLIENT)
 	install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../share/" DESTINATION ${SHAREDIR})
+	#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base/")
+	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../textures/base/pack" DESTINATION "${SHAREDIR}/textures/base/")
 
 	if(USE_GETTEXT)
 		foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
diff --git a/src/main.cpp b/src/main.cpp
index 35595e5aa..75ff569aa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1034,12 +1034,7 @@ int main(int argc, char *argv[])
 			// Check if the world is found from the default directory, and if
 			// not, see if the legacy world directory exists.
 			world_path = porting::path_user + DIR_DELIM + "worlds" + DIR_DELIM + "world";
-#ifdef RUN_IN_PLACE
-			std::string legacy_world_path = porting::path_user + DIR_DELIM +
-					".." + DIR_DELIM + "world";
-#else
 			std::string legacy_world_path = porting::path_user + DIR_DELIM + "world";
-#endif
 			if(!fs::PathExists(world_path) && fs::PathExists(legacy_world_path)){
 				errorstream<<"Warning: Using legacy world directory \""
 						<<legacy_world_path<<"\""<<std::endl;
diff --git a/src/porting.cpp b/src/porting.cpp
index 92615d77a..522afa9ef 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -123,8 +123,9 @@ void signal_handler_init(void)
 	Path mangler
 */
 
-std::string path_share = ".." DIR_DELIM "share";
-std::string path_user = ".." DIR_DELIM "user";
+// Default to RUN_IN_PLACE style relative paths
+std::string path_share = "..";
+std::string path_user = "..";
 
 std::string getDataPath(const char *subpath)
 {
@@ -167,8 +168,8 @@ void initializePaths()
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
 
-	path_share = std::string(buf) + "\\..\\share";
-	path_user = std::string(buf) + "\\..\\user";
+	path_share = std::string(buf) + "\\..";
+	path_user = std::string(buf) + "\\..";
 
 	/*
 		Linux
@@ -183,8 +184,8 @@ void initializePaths()
 	
 	pathRemoveFile(buf, '/');
 
-	path_share = std::string(buf) + "/../share";
-	path_user = std::string(buf) + "/../user";
+	path_share = std::string(buf) + "/..";
+	path_user = std::string(buf) + "/..";
 	
 	/*
 		OS X
@@ -194,8 +195,8 @@ void initializePaths()
 	//TODO: Get path of executable. This assumes working directory is bin/
 	dstream<<"WARNING: Relative path not properly supported on OS X and FreeBSD"
 			<<std::endl;
-	path_share = std::string("../share");
-	path_user = std::string("../user");
+	path_share = std::string("..");
+	path_user = std::string("..");
 
 	#endif
 
@@ -222,8 +223,8 @@ void initializePaths()
 	assert(len < buflen);
 	pathRemoveFile(buf, '\\');
 	
-	// Use ".\bin\..\share"
-	path_share = std::string(buf) + "\\..\\share";
+	// Use ".\bin\.."
+	path_share = std::string(buf) + "\\..";
 		
 	// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
 	len = GetEnvironmentVariable("APPDATA", buf, buflen);
@@ -247,7 +248,7 @@ void initializePaths()
 	//path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
 	if (!fs::PathExists(path_share)) {
 		dstream<<"WARNING: system-wide share not found at \""<<path_share<<"\"";
-		path_share = std::string(buf) + "/../share";
+		path_share = std::string(buf) + "/..";
 		dstream<<"WARNING: Using \""<<path_share<<"\" instead."<<std::endl;
 	}
 	
diff --git a/src/subgame.cpp b/src/subgame.cpp
index b4ae3185e..e55f1bc97 100644
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -124,12 +124,7 @@ std::vector<WorldSpec> getAvailableWorlds()
 	}
 	// Check old world location
 	do{
-#ifdef RUN_IN_PLACE
-		std::string fullpath = porting::path_user + DIR_DELIM + ".."
-				+ DIR_DELIM + "world";
-#else
 		std::string fullpath = porting::path_user + DIR_DELIM + "world";
-#endif
 		if(!fs::PathExists(fullpath))
 			break;
 		std::string name = "Old World";
diff --git a/share/textures/base/pack/fontdejavusansmono.png b/textures/base/pack/fontdejavusansmono.png
index 416a74f8a..416a74f8a 100644
--- a/share/textures/base/pack/fontdejavusansmono.png
+++ b/textures/base/pack/fontdejavusansmono.png
diff --git a/share/textures/base/pack/fontlucida.png b/textures/base/pack/fontlucida.png
index c63fa02b7..c63fa02b7 100644
--- a/share/textures/base/pack/fontlucida.png
+++ b/textures/base/pack/fontlucida.png
diff --git a/share/textures/base/pack/menubg.png b/textures/base/pack/menubg.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/share/textures/base/pack/menubg.png
+++ b/textures/base/pack/menubg.png
diff --git a/share/textures/base/pack/menulogo.png b/textures/base/pack/menulogo.png
index 76595c48d..76595c48d 100644
--- a/share/textures/base/pack/menulogo.png
+++ b/textures/base/pack/menulogo.png
diff --git a/share/textures/base/pack/smoke_puff.png b/textures/base/pack/smoke_puff.png
index e346d204c..e346d204c 100644
--- a/share/textures/base/pack/smoke_puff.png
+++ b/textures/base/pack/smoke_puff.png
diff --git a/share/textures/base/pack/sunrisebg.png b/textures/base/pack/sunrisebg.png
index d8b010ebb..d8b010ebb 100644
--- a/share/textures/base/pack/sunrisebg.png
+++ b/textures/base/pack/sunrisebg.png
diff --git a/share/textures/base/pack/unknown_block.png b/textures/base/pack/unknown_block.png
index a27cb8ca9..a27cb8ca9 100644
--- a/share/textures/base/pack/unknown_block.png
+++ b/textures/base/pack/unknown_block.png
diff --git a/share/textures/base/pack/unknown_item.png b/textures/base/pack/unknown_item.png
index 35cabf0ad..35cabf0ad 100644
--- a/share/textures/base/pack/unknown_item.png
+++ b/textures/base/pack/unknown_item.png
diff --git a/share/textures/base/pack/unknown_object.png b/textures/base/pack/unknown_object.png
index 4d6a98d56..4d6a98d56 100644
--- a/share/textures/base/pack/unknown_object.png
+++ b/textures/base/pack/unknown_object.png