From 672a8178d0b6b883f0fcc9ef75acb76e79daaf76 Mon Sep 17 00:00:00 2001
From: Ulrich Germann <Ulrich.Germann@gmail.com>
Date: Fri, 15 Apr 2016 16:38:47 +0100
Subject: [PATCH] Version-specific location for dependency irstlm.

---
 compile.sh                                   | 2 +-
 contrib/Makefiles/install-dependencies.gmake | 2 +-
 run-regtests.sh                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compile.sh b/compile.sh
index 01f86bc12..10de8c406 100755
--- a/compile.sh
+++ b/compile.sh
@@ -4,5 +4,5 @@
 
 set -e -o pipefail
 opt=$(pwd)/opt
-./bjam --with-irstlm=$opt --with-boost=$opt --with-cmph=$opt --with-xmlrpc-c=$opt --with-mm --with-probing-pt -j$(getconf _NPROCESSORS_ONLN) $@
+./bjam --with-irstlm=$opt/irstlm-5.80.08 --with-boost=$opt --with-cmph=$opt --with-xmlrpc-c=$opt --with-mm --with-probing-pt -j$(getconf _NPROCESSORS_ONLN) $@
 
diff --git a/contrib/Makefiles/install-dependencies.gmake b/contrib/Makefiles/install-dependencies.gmake
index bdbe7e43a..ce29e5172 100644
--- a/contrib/Makefiles/install-dependencies.gmake
+++ b/contrib/Makefiles/install-dependencies.gmake
@@ -31,7 +31,7 @@ BUILD_DIR = $(CWD)/opt/build/${URL}
 # you can also specify specific prefixes for different packages:
 XMLRPC_PREFIX ?= ${PREFIX}
 CMPH_PREFIX   ?= ${PREFIX}
-IRSTLM_PREFIX ?= ${PREFIX}
+IRSTLM_PREFIX ?= ${PREFIX}/irstlm-5.80.08
 BOOST_PREFIX  ?= ${PREFIX}
 
 # currently, the full enchilada means xmlrpc-c, cmph, irstlm, boost
diff --git a/run-regtests.sh b/run-regtests.sh
index 843ee3a94..f2c02aaa8 100755
--- a/run-regtests.sh
+++ b/run-regtests.sh
@@ -13,7 +13,7 @@ eval set -- "$args"
 noserver=false; 
 full=false;
 j=$(getconf _NPROCESSORS_ONLN)
-irstlm=$opt
+irstlm=$opt/irstlm-5.80.08
 boost=$opt
 cmph=$opt
 xmlrpc=--with-xmlrpc-c\=$opt