Revert "Fix to be able to build from dir different than source dir"

This commit broke RUN_IN_PLACE

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124e68ddd5b4242e7ed48b65dc2a0722e738240d..ff44e9c262489ce7d1836357af81ce5b4c13e482 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,20 +167,15 @@ endif()
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fonts" DESTINATION "${SHAREDIR}")
 
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" DESTINATION "${DOCDIR}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/lua_api.txt" DESTINATION "${DOCDIR}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/mapformat.txt" DESTINATION "${DOCDIR}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
+install(FILES "README.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/lua_api.txt" DESTINATION "${DOCDIR}")
+install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}")
+install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX)
-       install(FILES
-               "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetest.6"
-               "${CMAKE_CURRENT_SOURCE_DIR}/doc/minetestserver.6"
-               DESTINATION "${MANDIR}/man6")
-       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest.desktop"
-               DESTINATION "${XDG_APPS_DIR}")
-       install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.svg"
-               DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+       install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
+       install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
+       install(FILES "misc/minetest-icon.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 endif()
 
 #

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2d7439a0b30a66045b9fa0efe58114ca422d679..9bef3289e06351f37ad77c3fd0b71e4f86c43120 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -372,7 +372,7 @@ if(USE_CURL)
        )
 endif(USE_CURL)
 
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/bin")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})