--- a/metatools/sysdeftools/group/bld.inf Thu Aug 12 15:59:45 2010 +0100
+++ b/metatools/sysdeftools/group/bld.inf Thu Aug 26 10:06:23 2010 +0100
@@ -28,52 +28,52 @@
// raw scripts
-../checklinks.pl /epoc32/tools/build/checklinks.pl
-../filtering.xsl /epoc32/tools/build/filtering.xsl
-../joinandparesysdef.xsl /epoc32/tools/build/joinandparesysdef.xsl
-../joinsysdef.pl /epoc32/tools/build/joinsysdef.pl
-../joinsysdef.xsl /epoc32/tools/build/joinsysdef.xsl
-../mergesysdef.xsl /epoc32/tools/build/mergesysdef.xsl
-../rootsysdef.pl /epoc32/tools/build/rootsysdef.pl
-../sysdefdowngrade.xsl /epoc32/tools/build/sysdefdowngrade.xsl
-../validate-sysdef.xsl /epoc32/tools/build/validate-sysdef.xsl
+../checklinks.pl /epoc32/tools/metatools/checklinks.pl
+../filtering.xsl /epoc32/tools/metatools/filtering.xsl
+../joinandparesysdef.xsl /epoc32/tools/metatools/joinandparesysdef.xsl
+../joinsysdef.pl /epoc32/tools/metatools/joinsysdef.pl
+../joinsysdef.xsl /epoc32/tools/metatools/joinsysdef.xsl
+../mergesysdef.xsl /epoc32/tools/metatools/mergesysdef.xsl
+../rootsysdef.pl /epoc32/tools/metatools/rootsysdef.pl
+../sysdefdowngrade.xsl /epoc32/tools/metatools/sysdefdowngrade.xsl
+../validate-sysdef.xsl /epoc32/tools/metatools/validate-sysdef.xsl
// reusable modules and internal utilities
-../lib/filter-module.xsl /epoc32/tools/build/lib/filter-module.xsl
-../lib/joinsysdef-module.xsl /epoc32/tools/build/lib/joinsysdef-module.xsl
-../lib/mergesysdef-module.xsl /epoc32/tools/build/lib/mergesysdef-module.xsl
-../lib/modelcheck.xsl /epoc32/tools/build/lib/modelcheck.xsl
-../lib/path-module.xsl /epoc32/tools/build/lib/path-module.xsl
-../lib/test-model.xsl /epoc32/tools/build/lib/test-model.xsl
-../lib/usage.xsl /epoc32/tools/build/lib/usage.xsl
+../lib/filter-module.xsl /epoc32/tools/metatools/lib/filter-module.xsl
+../lib/joinsysdef-module.xsl /epoc32/tools/metatools/lib/joinsysdef-module.xsl
+../lib/mergesysdef-module.xsl /epoc32/tools/metatools/lib/mergesysdef-module.xsl
+../lib/modelcheck.xsl /epoc32/tools/metatools/lib/modelcheck.xsl
+../lib/path-module.xsl /epoc32/tools/metatools/lib/path-module.xsl
+../lib/test-model.xsl /epoc32/tools/metatools/lib/test-model.xsl
+../lib/usage.xsl /epoc32/tools/metatools/lib/usage.xsl
// Xalan jar files
-../xalanj/serializer.jar /epoc32/tools/build/xalanj/serializer.jar
-../xalanj/xalan.jar /epoc32/tools/build/xalanj/xalan.jar
-../xalanj/xercesImpl.jar /epoc32/tools/build/xalanj/xercesImpl.jar
-../xalanj/xml-apis.jar /epoc32/tools/build/xalanj/xml-apis.jar
+../xalanj/serializer.jar /epoc32/tools/metatools/xalanj/serializer.jar
+../xalanj/xalan.jar /epoc32/tools/metatools/xalanj/xalan.jar
+../xalanj/xercesImpl.jar /epoc32/tools/metatools/xalanj/xercesImpl.jar
+../xalanj/xml-apis.jar /epoc32/tools/metatools/xalanj/xml-apis.jar
// Perl-calling .bat files (identical, can export from any single one of these).
-../checklinks.bat /epoc32/tools/build/checklinks.bat
-../joinsysdef.bat /epoc32/tools/build/joinsysdef.bat
-../rootsysdef.bat /epoc32/tools/build/rootsysdef.bat
+../checklinks.bat /epoc32/tools/metatools/checklinks.bat
+../joinsysdef.bat /epoc32/tools/metatools/joinsysdef.bat
+../rootsysdef.bat /epoc32/tools/metatools/rootsysdef.bat
// Xalan-calling .bat/unix files (identical, can export from single file)
-../joinandparesysdef.bat /epoc32/tools/build/joinandparesysdef.bat
-../filtering.bat /epoc32/tools/build/filtering.bat
-../validate-sysdef.bat /epoc32/tools/build/validate-sysdef.bat
-unixxslcmd /epoc32/tools/build/joinandparesysdef
-unixxslcmd /epoc32/tools/build/filtering
-unixxslcmd /epoc32/tools/build/validate-sysdef
+../joinandparesysdef.bat /epoc32/tools/metatools/joinandparesysdef.bat
+../filtering.bat /epoc32/tools/metatools/filtering.bat
+../validate-sysdef.bat /epoc32/tools/metatools/validate-sysdef.bat
+unixxslcmd /epoc32/tools/metatools/joinandparesysdef
+unixxslcmd /epoc32/tools/metatools/filtering
+unixxslcmd /epoc32/tools/metatools/validate-sysdef
// Xalan-calling .bat/unix files that use XSLTC (identical, can export from single file)
-../mergesysdef.bat /epoc32/tools/build/mergesysdef.bat
-../sysdefdowngrade.bat /epoc32/tools/build/sysdefdowngrade.bat
-unixxsltccmd /epoc32/tools/build/mergesysdef
-unixxsltccmd /epoc32/tools/build/sysdefdowngrade
+../mergesysdef.bat /epoc32/tools/metatools/mergesysdef.bat
+../sysdefdowngrade.bat /epoc32/tools/metatools/sysdefdowngrade.bat
+unixxsltccmd /epoc32/tools/metatools/mergesysdef
+unixxsltccmd /epoc32/tools/metatools/sysdefdowngrade