fix

3 files changed, 8 insertions, 3 deletions

diff --git a/README b/README
index 84a40b3..06a2112 100644
--- a/README
+++ b/README
@@ -1 +1,4 @@
 Template directory for gnunet extensions.
+
+tools/build: script to build the extension, if it adheres to the default folder structure
+tools/update-msgtypes: extract a mapping from message IDs to java classes from the source code
diff --git a/bin/gnunet-ext b/bin/gnunet-ext
index 5df452f..e0146f6 100755
--- a/bin/gnunet-ext
+++ b/bin/gnunet-ext
@@ -4,7 +4,7 @@
 
 BASEDIR=`dirname $0`/..
 
-source $BASEDIR/extcfg.sh
+source $BASEDIR/envcfg
 
 java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.MyExt "$@"
 
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/"