Merge github.com:moses-smt/mosesdecoder

emjotde · May 31, 2012 · bc2bf82 · bc2bf82
2 parents 417d5ee + f716673
commit bc2bf82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
@@ -158,9 +158,11 @@ if [ option.get "git" : : "yes" ] {
 prefix = [ option.get "prefix" ] ;
 if $(prefix) {
   prefix = [ path.root $(prefix) [ path.pwd ] ] ;
+  prefix = $(prefix)$(GITTAG) ;
 } else {
   prefix = $(TOP)$(GITTAG) ;
 }
+
 rule install-bin-libs ( deps * ) {
   local bindir = [ option.get "bindir" : $(prefix)/bin ] ;
   local libdir = [ option.get "libdir" : $(prefix)/lib ] ;

diff --git a/mert/init.opt b/mert/init.opt