From e709c2b45d0bb04ab434a4a036fdea1e5fd9390a Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 19 Mar 2005 22:17:23 +0000
Subject: [PATCH] -I relay/

---
 symbian/group/bldlinux.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/symbian/group/bldlinux.mk b/symbian/group/bldlinux.mk
index 28e35bf62..961688f52 100644
--- a/symbian/group/bldlinux.mk
+++ b/symbian/group/bldlinux.mk
@@ -64,7 +64,8 @@ ARCH = series$(SERIES)
 SYMARCH = SERIES_$(SERIES)
 
 SRCDIR = ../src
-INCDIR = -I $(EPOC)/include -I $(EPOC)/include/libc -I../inc -I../../common
+INCDIR = -I. -I $(EPOC)/include -I $(EPOC)/include/libc -I../inc \
+	$(subst ../,../../,$(COMMON_INCS))
 LCLSRC = \
 	$(SRCDIR)/xwmain.cpp \
 	$(SRCDIR)/xwapp.cpp \
@@ -135,13 +136,11 @@ CFLAGS += $(OPT) -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \
 CPFLAGS = $(CFLAGS) -DCPLUS
 
 # Following is used for the resource file
-CPPFLAGS += -D_EPOC32_6 -DCPLUS -I../inc -D$(SYMARCH)
+CPPFLAGS += -D_EPOC32_6 -DCPLUS -I../inc -D$(SYMARCH) \
+	$(subst ../,../../,$(COMMON_INCS))
 
 all: _sanity $(PKGFILES) $(NAME).sis
 	mv $(NAME).sis $(SISNAME)
-ifdef XW_UPLOAD_DIR
-	cp $(SISNAME) $$XW_UPLOAD_DIR
-endif
 ifdef XW_UPLOAD_CMD
 	$(XW_UPLOAD_CMD) $(SISNAME)
 endif