--- Jamrules.in
+++ Jamrules.in
@@ -14,7 +14,7 @@
 nofst = @nofst@ ;
 noposix = @noposix@ ;
 
-prefix = @prefix@ ;
+prefix = $(DESTDIR)@prefix@ ;
 # autoconf incorrectly uses ${...} syntax, which Jam doesn't understand
 # this is a temporary workaround until we have figured out a better way
 # to fix this
--- Jamfile
+++ Jamfile
@@ -4,14 +4,14 @@
     mkdir -p $(INSTALL_DIR)
     install $(TOP)/ocrocmd/ocrocmd $(INSTALL_DIR)/ocrocmd
     install $(TOP)/ocroscript/ocroscript $(INSTALL_DIR)/ocroscript
-    test -d $(OCRODATA) || mkdir $(OCRODATA)
-    test -d $(OCRODATA)/words || mkdir $(OCRODATA)/words
+    test -d $(OCRODATA) || mkdir -p $(OCRODATA)
+    test -d $(OCRODATA)/words || mkdir -p $(OCRODATA)/words
     cp -v $(TOP)/data/words/* $(OCRODATA)/words
-    test -d $(OCRODATA)/models || mkdir $(OCRODATA)/models
+    test -d $(OCRODATA)/models || mkdir -p $(OCRODATA)/models
     cp -v $(TOP)/data/models/* $(OCRODATA)/models
-    test -d $(OCROSCRIPTS) || mkdir $(OCROSCRIPTS)
+    test -d $(OCROSCRIPTS) || mkdir -p $(OCROSCRIPTS)
     cp -v $(TOP)/ocroscript/scripts/*.lua $(OCROSCRIPTS)
-    test -d $(OCROSCRIPTS)/lib || mkdir $(OCROSCRIPTS)/lib
+    test -d $(OCROSCRIPTS)/lib || mkdir -p $(OCROSCRIPTS)/lib
     cp -v $(TOP)/ocroscript/scripts/lib/*.lua $(OCROSCRIPTS)/lib
 }
 
--- ocrocmd/ocrocmd
+++ ocrocmd/ocrocmd
@@ -1,4 +1,3 @@
 #! /bin/sh
-# This script is here just to shut up the automated tester.
-DIR=`dirname $0`/../ocroscript
-OCROSCRIPTS=$DIR/scripts $DIR/ocroscript rec-tess $@
+export OCROSCRIPTS=/usr/share/ocropus/scripts
+exec ocroscript rec-tess "$@"