1 files changed, 4 insertions, 2 deletions

diff --git a/tools/build b/tools/build
index 944d230..3ca8a76 100755
--- a/tools/build
+++ b/tools/build
@@ -5,16 +5,18 @@
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
+source $BASEDIR/envcfg
 
-source $BASEDIR/extcfg.sh
+CLASSPATH="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS"
 
+echo "using classpath $CLASSPATH"
 
 # collect all source files
 SOURCES=`find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java"`
 
 mkdir -p $BASEDIR/build
 
-javac $JFLAGS -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS" -d $BASEDIR/build/ $SOURCES
+javac $JFLAGS -cp $CLASSPATH  -d $BASEDIR/build/ $SOURCES
 
 cd "$BASEDIR/src/"