--- a/bmake.bat	Wed Dec 17 01:20:13 2014 +0000
+++ b/bmake.bat	Sat Dec 20 01:47:07 2014 +0100
@@ -9,22 +9,18 @@
 @IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 make.exe -N -f bc.mak  %DEFINES% %*
 
-@IF "%1" EQU "exe" GOTO finish
-
 @echo "***********************************"
 @echo "Buildung stx/libjava/experiments
 @echo "***********************************"
-@cd experiments
-@call bmake %1 %2
-@cd ..
+@pushd experiments
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
 @echo "***********************************"
 @echo "Buildung stx/libjava/tools
 @echo "***********************************"
-@cd tools
-@call bmake %1 %2
-@cd ..
+@pushd tools
+@call bmake %1 %2 || exit /b "%errorlevel%"
+@popd
 
 
-
-:finish