--- a/sbsv1_os/e32toolp/group/bld.inf	Sat Feb 27 18:45:43 2010 +0000
+++ b/sbsv1_os/e32toolp/group/bld.inf	Thu Mar 04 16:17:55 2010 +0000
@@ -37,6 +37,10 @@
 ../binutils/scpp.exe			/epoc32/tools/scpp.exe
 ../genutil/listzip.pl			/epoc32/tools/listzip.pl
 
+// Bootstrap e32toolp via an extention makefile which calls setupprj.bat
+../../../toolsandutils/buildsystem/extension/tools/abld_update.meta 	/epoc32/tools/makefile_templates/tools/abld_update.meta
+../../../toolsandutils/buildsystem/extension/tools/abld_update.mk 		/epoc32/tools/makefile_templates/tools/abld_update.mk
+
 ../../../toolsandutils/buildsystem/extension/app-services/buildstubsis.meta 		/epoc32/tools/makefile_templates/app-services/buildstubsis.meta
 ../../../toolsandutils/buildsystem/extension/app-services/buildstubsis.mk 		/epoc32/tools/makefile_templates/app-services/buildstubsis.mk
 ../../../toolsandutils/buildsystem/extension/app-services/buildupgradesis.meta 		/epoc32/tools/makefile_templates/app-services/buildupgradesis.meta

--- a/sbsv1_os/e32toolp/group/setupprj.bat	Sat Feb 27 18:45:43 2010 +0000
+++ b/sbsv1_os/e32toolp/group/setupprj.bat	Thu Mar 04 16:17:55 2010 +0000
@@ -117,18 +117,21 @@
 
 closedir CONFIGDIR;
 
-opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
-my @Docs = map lc $_, readdir SUBDIR;
-@Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+my @Docs;
+if (-d "..\\Docs") {
+	opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
+	@Docs = map lc $_, readdir SUBDIR;
+	@Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+  closedir SUBDIR;	
+}
 	
-closedir SUBDIR;	
 
 open TEMPLATEFILESUBDIR, "\"dir \/s \/b \/a-d ..\\..\\..\\toolsandutils\\buildsystem\\extension\" |";
 my @TemplateFiles=();
 my %TemplateDirs;
 while (<TEMPLATEFILESUBDIR>)
 	{
-	next if ($_ !~ /\.(mk|meta)$/i);	
+	next if ($_ !~ /\.(mk|meta|flm|xml)$/i);	
 	$_ =~ s/^.*\\buildsystem\\extension\\//i;
 	chomp $_;
 	push @TemplateFiles, $_;
@@ -241,6 +244,16 @@
  	);
 }
 
+if (scalar @Docs) {
+	&Output(
+		"$DocsPath :\n",
+		"\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n", 
+		"\n"
+	);
+} else {
+	$DocsPath = "";		# suppresses $DocsPath as a dependency in the main rules
+}
+
 &Output(
 	"$ShellFilePath :\n",
 	"\t\@perl -w ..\\genutil\\emkdir.pl $ShellFilePath\n", 
@@ -248,9 +261,6 @@
 	"$EPOCToolsConfigFilePath :\n",
 	"\t\@perl -w ..\\genutil\\emkdir.pl $EPOCToolsConfigFilePath\n", 
 	"\n",
-	"$DocsPath :\n",
-	"\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n", 
-	"\n",
 	"\n",
 	"deb : $EPOCToolsPath $EPOCToolsConfigFilePath $DocsPath $TemplateFilePath $ShellFilePath "
 );