diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-10-21 16:04:36 -0400 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-10-21 16:04:36 -0400 |
| commit | b6833f08df3afcce32ae2369750b55cfa6901d0a (patch) | |
| tree | fb52b320393d86d69344d73c5d7bf64f38160991 /lib | |
| parent | c8f01480d60651a1a68062b4939bee5398e5b8f7 (diff) | |
| parent | 3ce85b22708769ff9d8b2b0ba79e4157dac46d74 (diff) | |
| download | spack-b6833f08df3afcce32ae2369750b55cfa6901d0a.tar.gz spack-b6833f08df3afcce32ae2369750b55cfa6901d0a.tar.bz2 spack-b6833f08df3afcce32ae2369750b55cfa6901d0a.tar.xz spack-b6833f08df3afcce32ae2369750b55cfa6901d0a.zip | |
Merge pull request #129 from mathstuf/separate-prefix
spack: split spack_root from prefix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/__init__.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index caa09eb6e0..6e8d41895f 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -27,24 +27,26 @@ import tempfile from llnl.util.filesystem import * # This lives in $prefix/lib/spack/spack/__file__ -prefix = ancestor(__file__, 4) +spack_root = ancestor(__file__, 4) # The spack script itself -spack_file = join_path(prefix, "bin", "spack") +spack_file = join_path(spack_root, "bin", "spack") # spack directory hierarchy -etc_path = join_path(prefix, "etc") -lib_path = join_path(prefix, "lib", "spack") +lib_path = join_path(spack_root, "lib", "spack") build_env_path = join_path(lib_path, "env") module_path = join_path(lib_path, "spack") compilers_path = join_path(module_path, "compilers") test_path = join_path(module_path, "test") hooks_path = join_path(module_path, "hooks") -var_path = join_path(prefix, "var", "spack") +var_path = join_path(spack_root, "var", "spack") stage_path = join_path(var_path, "stage") +share_path = join_path(spack_root, "share", "spack") + +prefix = spack_root opt_path = join_path(prefix, "opt") install_path = join_path(opt_path, "spack") -share_path = join_path(prefix, "share", "spack") +etc_path = join_path(prefix, "etc") # # Set up the packages database. |