From bdfd802a9cb11a68fbbc525ce97b31cad933f396 Mon Sep 17 00:00:00 2001
From: Minero Aoki <mineroaoki@gmail.com>
Date: Sun, 14 Sep 2008 16:25:04 +0000
Subject: [PATCH] * bin/cbc: follow last directory tree change. *
 test/test_cbc.sh: ditto.

git-svn-id: file:///Users/aamine/c/gitwork/public/cbc/trunk@4019 1b9489fe-b721-0410-924e-b54b9192deb8
---
 ChangeLog        |  6 ++++++
 bin/cbc          | 14 +++++++++-----
 test/test_cbc.sh |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0580143..93eca84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 15 01:24:57 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* bin/cbc: follow last directory tree change.
+
+	* test/test_cbc.sh: ditto.
+
 Mon Sep 15 01:19:36 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* cbc -> bin/cbc
diff --git a/bin/cbc b/bin/cbc
index 96cdd84..ca0056d 100755
--- a/bin/cbc
+++ b/bin/cbc
@@ -1,7 +1,11 @@
-#!/bin/sh
+#!/bin/bash
+# cbc -- cflat compiler
 
-basedir=`dirname "$0"`
-java -classpath "$basedir/cbc.jar" \
+JAVA=java
+
+srcdir_root="$(dirname "$(dirname "$0")")"
+"$JAVA" -classpath "$srcdir_root/lib/cbc.jar" \
         net.loveruby.cflat.compiler.Compiler \
-        -I"$basedir/import" \
-        ${@+"$@"}
+        -I"$srcdir_root/import" \
+        -L"$srcdir_root/lib" \
+        "$@"
diff --git a/test/test_cbc.sh b/test/test_cbc.sh
index 00020da..2051c20 100644
--- a/test/test_cbc.sh
+++ b/test/test_cbc.sh
@@ -332,7 +332,7 @@ assert_private() {
     assert_eq "private" `symbol_visibility $1 $2`
 }
 
-CBC=../cbc
+CBC=../bin/cbc
 
 assert_compile_success() {
     assert_status 0 $CBC "$@"