[gccsdk] GCC SVN reorganisation

I notice that GCC's SVN has been shuffled about so that there's
a new directory gccsdk/trunk/tools in addition to gccsdk/trunk/gcc4.
tools now contains asasm, decaof and elftoolchain.

However, when I build GCCSDK via ./build-world it's still looking for asasm
in gccsdk/trunk/gcc4/riscos/ and the build fails as it isn't there. If I check
out the tools directory there, ie

svn co svn://svn.riscos.info/gccsdk/trunk/gcc4
svn co svn://svn.riscos.info/gccsdk/trunk/tools
mv tools/* gcc4/riscos/

then I start to make some progress but the build rapidly falls over:

cd /var/lib/jenkins/workspace/gcc-head/gcc4/riscos && ./build-it -f cross
+++ Building asasm
main::scan_file() called too early to check prototype at /var/lib/jenkins/workspace/gcc-head/gcc4/builddir/installed-buildtools-for-binutils/bin/aclocal line 617.
libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
libtoolize: copying file `build-aux/ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
main::scan_file() called too early to check prototype at /var/lib/jenkins/workspace/gcc-head/gcc4/builddir/installed-buildtools-for-binutils/bin/aclocal line 617.
configure.ac:18: installing `build-aux/compile'
configure.ac:21: installing `build-aux/config.guess'
configure.ac:21: installing `build-aux/config.sub'
configure.ac:9: installing `build-aux/install-sh'
configure.ac:9: installing `build-aux/missing'
src/Makefile.am: installing `build-aux/depcomp'
Makefile.am:11: required directory ./decaof does not exist
Makefile.am:11: required directory ./elftoolchain does not exist
autoreconf: automake failed with exit status: 1
make[1]: *** [cross-riscostools-built] Error 1
make[1]: Leaving directory `/var/lib/jenkins/workspace/gcc-head/gcc4'
make: *** [getenv] Error 2

So that I can update the guide at:
http://www.riscos.info/index.php/Using_GCCSDK

what's the 'approved' way to check these out so the build completes?

Thanks
Theo

_______________________________________________
GCCSDK mailing list gcc@gccsdk.riscos.info
Bugzilla: http://www.riscos.info/bugzilla/index.cgi
List Info: http://www.riscos.info/mailman/listinfo/gcc
Main Page: http://www.riscos.info/index.php/GCCSDK