From: Brian Norris <banorris@uci.edu>
Date: Wed, 4 Sep 2013 02:19:25 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oopsla2015~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=5c4efe5cd8bdfe1e85138396109876a121ca61d1;hp=1f2a30ddc8f38f3f45d62d169b766c0c38364ecd

Merge remote-tracking branch 'origin/master'
---

diff --git a/run.sh b/run.sh
index b611406..0807b2e 100755
--- a/run.sh
+++ b/run.sh
@@ -11,12 +11,15 @@
 # default program.
 #
 
-BIN=./test/userprog.o
+# Get the directory in which this script and the binaries are located
+BINDIR="${0%/*}"
+
+BIN=${BINDIR}/test/userprog.o
 PREFIX=
 
-export LD_LIBRARY_PATH=.
+export LD_LIBRARY_PATH=${BINDIR}
 # For Mac OSX
-export DYLD_LIBRARY_PATH=.
+export DYLD_LIBRARY_PATH=${BINDIR}
 
 [ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
 [ $# -gt 0 ] && [ -e "$1" ] && BIN="$1" && shift