--- a/baseport/syborg/bld.inf	Fri Aug 27 17:26:55 2010 +0100
+++ b/baseport/syborg/bld.inf	Tue Sep 07 12:23:10 2010 +0100
@@ -36,9 +36,9 @@
 PRJ_EXTENSIONS
 start		extension		base/genexec
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
 #endif
 option		EXTRA_SRC_PATH  $(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel/eka/kernel
 end
@@ -114,19 +114,26 @@
 PRJ_EXTENSIONS
 start		extension		base/bootstrap
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-option INC_PATH   /epoc32/include
+option INC_PATH   $(EPOCROOT)epoc32/include
 #else
-option INC_PATH  /epoc32/include/platform
+option INC_PATH  $(EPOCROOT)epoc32/include/platform
+#endif
+#ifdef GCCE
+option		GCCE			GCCE
+#endif
+#ifdef ARMCC
+option		ARMCC			ARMCC
 #endif
 option		NAME			_syborg_bootloader_bootrom
 option		MEMMODEL		multiple
 //option		MEMMODEL		flexible
 //option		MEMMODEL		moving
 option		SOURCES			syborg.s
+//option		INCLUDES		$(EXTENSION_ROOT)/config.inc $(EXTENSION_ROOT)/bootstrap/syborg.inc
 option		INCLUDES		config.inc syborg.inc
 option		E32PATH			$(EXTENSION_ROOT)/../../../../os/kernelhwsrv/kernel
 option		EXTRA_INC_PATH	$(EXTENSION_ROOT)/bootstrap
-option		EXTRA_SRC_PATH	$(EXTENSION_ROOT)/bootstrap 
+option		EXTRA_SRC_PATH	$(EXTENSION_ROOT)/bootstrap
 end
 
 // Build image armv5 for urel and udeb