3 files changed, 17 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index 5602774..84cd651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.swo
 *.swp
 
+*.out
+*.log
 *.stderr
 *.stdout
 
@@ -10,4 +12,4 @@ models/*/model.npz
 models/*/model.npz.json
 models/*/vocab.*
 models/*/*.bpe
-models/*/truecase.*
+models/*/truecase*
diff --git a/Makefile b/Makefile
index bbd423e..c90ced5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,26 @@
-
 THREADS=16
 
-GIT_MARIAN=http://github.com/marian-nmt/marian-dev.git
+GIT_MARIAN_DEV=http://github.com/marian-nmt/marian-dev.git
+GIT_MARIAN=http://github.com/marian-nmt/marian.git
 GIT_MOSES_SCRIPTS=http://github.com/marian-nmt/moses-scripts.git
 GIT_SUBWORD_NMT=http://github.com/rsennrich/subword-nmt.git
 
-URL_MODELS=
-
-.PHONY: marian install
+.PHONY: tools/marian-dev tools/marian install
 .SECONDARY:
 
 
-install: marian/build/marian tools
+#####################################################################
 
-tools:
-	mkdir -p $@
-	cd $@ && git clone $(GIT_MOSES_SCRIPTS)
-	cd $@ && git clone $(GIT_SUBWORD_NMT)
+install: tools models
+
+tools: tools/marian
+	git -C $@/moses-scripts pull || git clone $(GIT_MOSES_SCRIPTS) $@/moses-scripts
+	git -C $@/subword-nmt pull || git clone $(GIT_SUBWORD_NMT) $@/subword-nmt
+
+tools/marian:
+	git -C $@ pull || git clone $(GIT_MARIAN_DEV) $@
+	mkdir -p $@/build && cd $@/build && cmake .. -DCOMPILE_EXAMPLES=ON -DUSE_CUDNN=ON && make -j$(THREADS)
 
 models:
 	mkdir -p $@
 	cd $@ && bash download_wmt16.sh
-
-#####################################################################
-
-marian/build/marian: marian
-	mkdir -p $</build && cd $</build && cmake .. -DCOMPILE_EXAMPLES=ON -DUSE_CUDNN=ON && make -j$(THREADS)
-
-marian:
-	git -C $@ pull || git clone $(GIT_MARIAN) $@
diff --git a/run_mrt.sh b/run_mrt.sh
index 27eb187..8d82491 100755
--- a/run_mrt.sh
+++ b/run_mrt.sh
@@ -4,9 +4,9 @@ SHELL=/bin/bash
 
 export MRT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export MRT_TOOLS=$MRT_ROOT/tools
+export MRT_MARIAN=$MRT_TOOLS/marian
 export MRT_MODELS=$MRT_ROOT/models
 
-export MRT_MARIAN=$MRT_ROOT/marian
 export MRT_GPUS=0