From 190b9ab94466379248149ff2aed1b4a63d56ada0 Mon Sep 17 00:00:00 2001
From: Marqt <marek@wydmuch.poznan.pl>
Date: Wed, 15 Feb 2017 21:24:50 +0100
Subject: [PATCH] Changed destination path in download_freedoom.sh to ./bin

Former-commit-id: 57f4df760ae555d9e42852764ce79c46e19d202d
---
 .gitignore                           | 1 +
 CMakeLists.txt                       | 1 -
 scripts/assemble_luarocks_package.sh | 2 +-
 scripts/assemble_pip_package.sh      | 2 +-
 scripts/download_freedoom.sh         | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 123835b2b..65380c109 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,7 @@ src/vizdoom/zlib/x64/
 *.bcp
 *.lmp
 *.log
+*.zip
 **/doom2.wad
 **/doom.wad
 **/freedoom2.wad
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6271ef47c..b1caaf993 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,7 +315,6 @@ if (BUILD_LUA AND (NOT BUILD_LUA52))
 
     include_directories(${VIZDOOM_LUA_INCLUDE_DIR}
             ${Boost_INCLUDE_DIR}
-            ${PYTHON_INCLUDE_DIRS}
             ${LUA_INCLUDE_DIR}
             #${LUABIND_INCLUDE_DIRS}
             ${VIZDOOM_SRC_DIR}/lib_lua/luabind)
diff --git a/scripts/assemble_luarocks_package.sh b/scripts/assemble_luarocks_package.sh
index 1b11db74d..679f1dbd0 100755
--- a/scripts/assemble_luarocks_package.sh
+++ b/scripts/assemble_luarocks_package.sh
@@ -13,7 +13,7 @@ fi
 
 PK3_PATH="./bin/vizdoom.pk3"
 LUA_BIN_PATH="${PACKAGE_DEST_DIRECTORY}/vizdoom.so"
-FREEDOOM_PATH="./freedoom2.wad"
+FREEDOOM_PATH="./bin/freedoom2.wad"
 SCENARIOS_DEST_DIR="${PACKAGE_DEST_PATH}/scenarios"
 SCENARIOS_PATH="./scenarios"
 
diff --git a/scripts/assemble_pip_package.sh b/scripts/assemble_pip_package.sh
index e4c360f92..213889ada 100755
--- a/scripts/assemble_pip_package.sh
+++ b/scripts/assemble_pip_package.sh
@@ -23,7 +23,7 @@ fi
 
 PK3_PATH="./bin/vizdoom.pk3"
 PYTHON_BIN_PATH="${PACKAGE_DEST_DIRECTORY}/vizdoom.so"
-FREEDOOM_PATH="./freedoom2.wad"
+FREEDOOM_PATH="./bin/freedoom2.wad"
 SCENARIOS_DEST_DIR="${PACKAGE_DEST_PATH}/scenarios"
 SCENARIOS_PATH="./scenarios"
 
diff --git a/scripts/download_freedoom.sh b/scripts/download_freedoom.sh
index 4b7ed2cfb..14693359f 100755
--- a/scripts/download_freedoom.sh
+++ b/scripts/download_freedoom.sh
@@ -4,8 +4,8 @@
 
 FREEDOOM_LINK="https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip"
 
-FREEDOOM_DOWNLOAD_PATH="./bin"
-FREEDOOM_DESTINATION_PATH="."
+FREEDOOM_DOWNLOAD_PATH="."
+FREEDOOM_DESTINATION_PATH="./bin"
 
 if [ ! -e  "${FREEDOOM_DESTINATION_PATH}/freedoom2.wad" ]
 then