summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorKevin Brandstatter <kjbrandstatter@gmail.com>2015-02-26 14:42:12 -0600
committerKevin Brandstatter <kjbrandstatter@gmail.com>2015-02-26 14:42:12 -0600
commit2f2eab0e157b7ebced80772d9bc81b205d69d620 (patch)
tree2e7fc63859631b84f68aeeb14d8414a5ecb01f9c /share
parentbbfc519ee5631efa4224d852d9c63446a60a8c07 (diff)
parentffdb90f39a56e5f0dacefd19ccf85ddd0e7a01c0 (diff)
downloadspack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.gz
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.bz2
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.tar.xz
spack-2f2eab0e157b7ebced80772d9bc81b205d69d620.zip
Merge branch 'develop' of github.com:kev40293/spack into develop
Diffstat (limited to 'share')
-rwxr-xr-xshare/spack/setup-env.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh
index 91b1dc4630..b2bcbaf6c7 100755
--- a/share/spack/setup-env.sh
+++ b/share/spack/setup-env.sh
@@ -165,8 +165,8 @@ fi
#
# Set up modules and dotkit search paths in the user environment
#
-_sp_share_dir="$(dirname $_sp_source_file)"
-_sp_prefix="$(dirname $(dirname $_sp_share_dir))"
+_sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd)
+_sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd)
# TODO: fix SYS_TYPE to something non-LLNL-specific
_spack_pathadd DK_NODE "$_sp_share_dir/dotkit/$SYS_TYPE"