X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mop%2Fpublic%2Fcompile.sh;h=24731d92e6dba4b3e7721385753be21d764878f3;hb=28c3aa2bd73958557fc5e5441bcb7a2a2ca1c375;hp=f96528f2a5bcb1eb813e9e233c4330b96017417f;hpb=fc833e30d9b1315ffdeb780d5257e8e1bdafad43;p=moe.git

diff --git a/mop/public/compile.sh b/mop/public/compile.sh
index f96528f..24731d9 100755
--- a/mop/public/compile.sh
+++ b/mop/public/compile.sh
@@ -3,8 +3,11 @@
 
 set -e
 [ -n "$MO_ROOT" -a -d "$MO_ROOT" ] || { echo >&2 "MO_ROOT not set, giving up." ; exit 1 ; }
-. $MO_ROOT/bin/lib
-. $MO_ROOT/config
+pushd $MO_ROOT >/dev/null
+. lib/libeval.sh
+. cf/eval
+. cf/mop
+popd >/dev/null
 
 [ -n "$1" ] || die "Usage: compile (<problem> | <file> [<options>])"
 if [ "${1%%.*}" == "$1" ] ; then
@@ -26,7 +29,7 @@ else
 	SRCEXT=${1/*./}
 	shift
 	EXTRA_CFLAGS="$@"
-	CCMD=COMP_$SRCEXT
+	CCMD=EXT_${SRCEXT}_COMP
 	[ -n "${!CCMD}" ] || die "Don't know how to compile $SRC"
 	CCMD="`eval echo ${!CCMD}`"
 	echo "$CCMD"