From 07832135a3086b3dbded8b0eec53f116ad60228b Mon Sep 17 00:00:00 2001
From: oyvind <oyvind@2333b21a-1c27-0410-8132-afba56cb5048>
Date: Thu, 24 Sep 2009 08:08:32 +0000
Subject: [PATCH] 	* Fix regression in nios_env.sh under Cygwin when 
 picking up the full path to nios_env.sh to support 	running nios_env.sh in
 pwd!=nios2ecos

git-svn-id: http://www.ecosforge.net/ecosforge/trunk/nios2ecos@281 2333b21a-1c27-0410-8132-afba56cb5048
---
 ChangeLog   | 6 ++++++
 nios_env.sh | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 115ac6f..66e9417 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-24 Øyvind Harboe <oyvind.harboe@zylin.com>
+
+	* Fix regression in nios_env.sh under Cygwin when
+	picking up the full path to nios_env.sh to support
+	running nios_env.sh in pwd!=nios2ecos
+
 2009-09-23 Edgar Grimberg <edgar.grimberg@zylin.com>
 
 	* added support for 28F256P30B and 28F256P30T flash chips
diff --git a/nios_env.sh b/nios_env.sh
index c33a3d6..39a8c29 100644
--- a/nios_env.sh
+++ b/nios_env.sh
@@ -8,7 +8,10 @@
 
 # Be afraid!!!! here we have to figure out the location of the
 # script being sourced!!!! Requires bash 3.0 or later.
-export NIOS_ECOS=$(readlink -f ${BASH_ARGV[0]%/*}/packages)
+export NIOS2_ENV_PATH=$(dirname $BASH_ARGV)
+export NIOS_ECOS=$(readlink -f $NIOS2_ENV_PATH/packages)
+
+echo "Test $BASH_ARGV"
 
 echo "NIOS_ECOS = $NIOS_ECOS"
 
-- 
2.11.4.GIT