# HG changeset patch
# User Mike Kinghan <mikek@symbian.org>
# Date 1289914589 0
# Node ID 4a6676d432dd838fcaae72d61097cb0e717149c6
# Parent  db68a2e8e171caf01011ec07e3134d62dbb18c5a
Fix for Bug 3944 - Relative paths are systematically too long in Beagleboard bld.inf and .mmp files

diff -r db68a2e8e171 -r 4a6676d432dd omap3530/beagle_drivers/hal/bld.inf
--- a/omap3530/beagle_drivers/hal/bld.inf	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/beagle_drivers/hal/bld.inf	Tue Nov 16 13:36:29 2010 +0000
@@ -21,7 +21,7 @@
 PRJ_EXTENSIONS
 start		extension		base/config
 
-option		HALPATH			$(EXTENSION_ROOT)/../../../../../../../sf/os/kernelhwsrv/halservices
+option		HALPATH			$(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/halservices
 option		PREFIX			_beagle_
 option		SOURCE			$(EXTENSION_ROOT)/.
 
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/beagle_drivers/hal/hal.mmp
--- a/omap3530/beagle_drivers/hal/hal.mmp	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/beagle_drivers/hal/hal.mmp	Tue Nov 16 13:36:29 2010 +0000
@@ -20,7 +20,7 @@
 linkas			hal.dll
 noexportlibrary
 
-sourcepath		../../../../../../../sf/os/kernelhwsrv/halservices/hal/src
+sourcepath		../../../../../../sf/os/kernelhwsrv/halservices/hal/src
 source			hal_main.cpp userhal.cpp
 
 sourcepath		+/build/generatedcpp/hal
@@ -30,7 +30,7 @@
 
 library			euser.lib
 
-deffile			../../../../../../../sf/os/kernelhwsrv/halservices/hal/~/hal.def
+deffile			../../../../../../sf/os/kernelhwsrv/halservices/hal/~/hal.def
 
 uid				0x1000008d 0x100039e8
 
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/beagle_drivers/keytran/keymap.mmp
--- a/omap3530/beagle_drivers/keytran/keymap.mmp	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/beagle_drivers/keytran/keymap.mmp	Tue Nov 16 13:36:29 2010 +0000
@@ -37,7 +37,7 @@
 
 library				euser.lib
 
-deffile				../../../../../../../sf/os/kernelhwsrv/kernel/eka/~/ekdata.def
+deffile				../../../../../../sf/os/kernelhwsrv/kernel/eka/~/ekdata.def
 
 nostrictdef
 noexportlibrary
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/beagleboard/bld.inf
--- a/omap3530/beagleboard/bld.inf	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/beagleboard/bld.inf	Tue Nov 16 13:36:29 2010 +0000
@@ -38,7 +38,7 @@
 src/vbeagle
 
 // Build MEDINT.PDD - this depends on our variantmediadef.h
-../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
+../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
 
 
 //
@@ -66,7 +66,7 @@
 option		EXTRA_SRC_PATH		$(EXTENSION_ROOT)/bootstrap
 option		EXTRA_INC_PATH		$(EXTENSION_ROOT)/bootstrap
 option		INCLUDES		config.inc
-option		E32PATH			$(EXTENSION_ROOT)/../../../../../../sf/os/kernelhwsrv/kernel
+option		E32PATH			$(EXTENSION_ROOT)/../../../../../sf/os/kernelhwsrv/kernel
 
 end
 
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/kernel/bld.inf
--- a/omap3530/kernel/bld.inf	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/kernel/bld.inf	Tue Nov 16 13:36:29 2010 +0000
@@ -27,9 +27,10 @@
 //../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
 //../../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
 
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/ekern
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/kc_exe
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/ekern
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/kc_exe
 //../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/medint/medint
-../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmoncommon
-../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
-../../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
\ No newline at end of file
+../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmoncommon
+../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/trace/btracex
+../../../../../sf/os/kernelhwsrv/kernel/eka/euser/variant_euser
+
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/omap3530_drivers/usbcc/usbcc.mmp
--- a/omap3530/omap3530_drivers/usbcc/usbcc.mmp	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/omap3530_drivers/usbcc/usbcc.mmp	Tue Nov 16 13:36:29 2010 +0000
@@ -27,7 +27,7 @@
 linkas				usbcc.dll
 noexportlibrary
 
-sourcepath			../../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/usbcc
+sourcepath			../../../../../../sf/os/kernelhwsrv/kernel/eka/drivers/usbcc
 source				chapter9.cpp
 source				descriptors.cpp
 source				misc.cpp
@@ -42,7 +42,7 @@
 library				AsspTarget(kaomap3530,lib)
 library				AsspTarget(usbv,lib)
 
-deffile				../../../../../../../sf/os/kernelhwsrv/kernel/eka/~/usbcc.def
+deffile				../../../../../../sf/os/kernelhwsrv/kernel/eka/~/usbcc.def
 
 epocallowdlldata
 
diff -r db68a2e8e171 -r 4a6676d432dd omap3530/shared/monitor/monitor.mmp
--- a/omap3530/shared/monitor/monitor.mmp	Sat Nov 13 16:24:03 2010 +0000
+++ b/omap3530/shared/monitor/monitor.mmp	Tue Nov 16 13:36:29 2010 +0000
@@ -19,7 +19,7 @@
 #define __USING_ASSP_INTERRUPT_API__
 
 #include			"assp/omap3530_assp/assp.mmh"
-#include			"../../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmondebug.mmp"
+#include			"../../../../../../sf/os/kernelhwsrv/kernel/eka/kernel/exmondebug.mmp"
 
 target				AsspTarget(exmondebug,dll)