From be3ce617c718cee0cbd418cd1b014f9e9480a0b9 Mon Sep 17 00:00:00 2001
From: jdiez17 <jose.manuel.diez@gmail.com>
Date: Sat, 22 Feb 2014 15:30:50 +0000
Subject: [PATCH] Changed binary output directory from src/ to bin/

---
 CMakeLists.txt         | 2 ++
 Makefile               | 6 +++---
 src/po/Makefile        | 2 +-
 src/testdir/Makefile   | 2 +-
 src/testdir/test49.vim | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index adb9894a3c..340bbad979 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,5 +21,7 @@ include_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/include")
 
 include_directories ("${PROJECT_BINARY_DIR}/config") 
 
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 add_subdirectory(src)
 add_subdirectory(config)
diff --git a/Makefile b/Makefile
index 6e456022c2..ef609b0a49 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug
 
-build/src/vim: deps
+build/bin/vim: deps
 	cd build && make
 
-test: build/src/vim
+test: build/bin/vim
 	cd src/testdir && make
 
 deps: .deps/usr/lib/libuv.a
@@ -23,4 +23,4 @@ clean:
 
 .PHONY: test deps cmake
 
-.DEFAULT: build/src/vim
+.DEFAULT: build/bin/vim
diff --git a/src/po/Makefile b/src/po/Makefile
index 8674031d84..e22c7f807e 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -127,7 +127,7 @@ CHECKFILES = \
 
 PACKAGE = vim
 SHELL = /bin/sh
-VIM = ../../build/src/vim
+VIM = ../../build/bin/vim
 
 # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext
 # tools 0.10.37, which use a slightly different .po file format that is not
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 5238fda86a..8915328a8f 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -2,7 +2,7 @@
 # Makefile to run all tests for Vim
 #
 
-VIMPROG = ../../build/src/vim
+VIMPROG = ../../build/bin/vim
 
 # Uncomment this line to use valgrind for memory leaks and extra warnings.
 #   The output goes into a file "valgrind.testN"
diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim
index eaf0cba00b..f5e6d56bc3 100644
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -456,7 +456,7 @@ function! ExtraVim(...)
     " messing up the user's viminfo file.
     let redirect = a:0 ?
 	\ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : ""
-    exec "!echo '" . debug_quits . "q' | ../../build/src/vim -u NONE -N -Xes" . redirect .
+    exec "!echo '" . debug_quits . "q' | ../../build/bin/vim -u NONE -N -Xes" . redirect .
 	\ " -c 'debuggreedy|set viminfo+=nviminfo'" .
 	\ " -c 'let ExtraVimBegin = " . extra_begin . "'" .
 	\ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints .