# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1277988550 -3600
# Node ID e69da846291659aea46c74688448ef6e03348699
# Parent  626366955efbe2193ff5ac83124bfd9d697ece1a
Revised fix for Bug 3059, and check for GCCE441BIN first

diff -r 626366955efb -r e69da8462916 toolsandutils/buildsystem/extension/base/bootstrap.mk
--- a/toolsandutils/buildsystem/extension/base/bootstrap.mk	Sun Jun 27 13:33:42 2010 +0100
+++ b/toolsandutils/buildsystem/extension/base/bootstrap.mk	Thu Jul 01 13:49:10 2010 +0100
@@ -109,12 +109,12 @@
 else
 EXE_SUFFIX := .exe
 endif
-ifdef SBS_GCCE432BIN
-GCCEBIN := $(SBS_GCCE432BIN)
+ifdef SBS_GCCE441BIN
+GCCEBIN := $(SBS_GCCE441BIN)
 else ifdef SBS_GCCE433BIN
 GCCEBIN := $(SBS_GCCE433BIN)
-else ifdef SBS_GCCE441BIN
-GCCEBIN := $(SBS_GCCE441BIN)
+else ifdef SBS_GCCE432BIN
+GCCEBIN := $(SBS_GCCE432BIN)
 endif
 GCCEASM := $(GCCEBIN)/arm-none-symbianelf-as$(EXE_SUFFIX)
 GCCELD := $(GCCEBIN)/arm-none-symbianelf-ld$(EXE_SUFFIX)
@@ -337,7 +337,7 @@
 BASEINCLUDES := bootcpu.inc bootmacro.inc
 endif
 BASEINCLUDES := $(foreach f,$(BASEINCLUDES),$(basename $(f)).$(INCEXT))
-INCLUDES := $(foreach f,$(INCLUDES),$(basename $(f)).$(INCEXT))
+INCLUDES := $(foreach f,$(INCLUDES),$(basename $(notdir $(f))).$(INCEXT))
 
 # Generic object files
 BASEOBJECTS = $(foreach src, $(BASESOURCES), $(basename $(src)).$(OBJEXT))
@@ -378,7 +378,7 @@
 	perl $(EPOCROOT)epoc32/tools/armasm2as.pl $< $@
 
 $(FULLINCLUDES) : $(EPOCBLDABS)/%.$(INCEXT) : %.inc $(call pipe,$(EPOCBLDABS))
-	perl $(EPOCROOT)/epoc32/tools/armasm2as.pl $< $(EPOCBLDABS)/$(notdir $@)
+	perl $(EPOCROOT)/epoc32/tools/armasm2as.pl $< $@
 
 $(FULLBASEOBJECTS) : $(EPOCBLDABS)/%.$(OBJEXT) : %.$(SRCEXT) $(FULLINCLUDES) $(FULLBASEINCLUDES) $(FULLGENINCLUDES) $(call pipe,$(EPOCBLDABS))
 	$(do_asm)