diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-17 00:49:52 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-17 00:49:52 -0800 |
| commit | 17ac609d2399af891c4aa85c09585ed8eadf06ff (patch) | |
| tree | 587f8c702e431189df5a2ba725dd2339824a8587 /share | |
| parent | 724b72bdaf5c7c569e502e383e2aadcb8105983c (diff) | |
| parent | 0c94a6e2b0fb6b7b8f1fd78f6bb56ea9f5bf3d85 (diff) | |
| download | spack-17ac609d2399af891c4aa85c09585ed8eadf06ff.tar.gz spack-17ac609d2399af891c4aa85c09585ed8eadf06ff.tar.bz2 spack-17ac609d2399af891c4aa85c09585ed8eadf06ff.tar.xz spack-17ac609d2399af891c4aa85c09585ed8eadf06ff.zip | |
Merge branch 'features/memaxes' into develop
Conflicts:
var/spack/packages/libpng/package.py
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 4 |
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" |