Version-specific location for dependency irstlm.

wuhaiyangit · Apr 15, 2016 · 672a817 · 672a817
1 parent 35c4abd
commit 672a817
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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