diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-25 00:39:31 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-06-24 22:39:31 -0700 |
| commit | e5ce7b163954843cf7247e2902535ab837aea320 (patch) | |
| tree | 52e019d52019b8986a2d327fba981bedb22c6471 /var | |
| parent | cac4362f6491bf48dd287f31f3de9169464713ea (diff) | |
| download | spack-e5ce7b163954843cf7247e2902535ab837aea320.tar.gz spack-e5ce7b163954843cf7247e2902535ab837aea320.tar.bz2 spack-e5ce7b163954843cf7247e2902535ab837aea320.tar.xz spack-e5ce7b163954843cf7247e2902535ab837aea320.zip | |
Allow arbitrary Prefix attributes (#4591)
* Allow arbitrary Prefix attributes
* Test attribute type as well
* Flake8 fixes
* Remove __new__ method
* Fewer uses of join_path in the docs
Diffstat (limited to 'var')
6 files changed, 17 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/bwa/package.py b/var/spack/repos/builtin/packages/bwa/package.py index 0b3ac66b3e..c4cd0d6665 100644 --- a/var/spack/repos/builtin/packages/bwa/package.py +++ b/var/spack/repos/builtin/packages/bwa/package.py @@ -51,5 +51,5 @@ class Bwa(Package): mkdirp(prefix.doc) install('README.md', prefix.doc) install('NEWS.md', prefix.doc) - mkdirp(prefix.man1) - install('bwa.1', prefix.man1) + mkdirp(prefix.man.man1) + install('bwa.1', prefix.man.man1) diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 847eff62f3..f01cc37d7b 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -186,6 +186,6 @@ class Git(AutotoolsPackage): prefix = self.prefix with working_dir('git-manpages'): - install_tree('man1', prefix.share_man1) - install_tree('man5', prefix.share_man5) - install_tree('man7', prefix.share_man7) + install_tree('man1', prefix.share.man.man1) + install_tree('man5', prefix.share.man.man5) + install_tree('man7', prefix.share.man.man7) diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index 32144e96ba..cb672dddc4 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -68,7 +68,7 @@ class Libdwarf(Package): make.add_default_arg('ARFLAGS=rcs') # Dwarf doesn't provide an install, so we have to do it. - mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man1) + mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man.man1) with working_dir('libdwarf'): extra_config_args = [] @@ -101,4 +101,4 @@ class Libdwarf(Package): install('dwarfdump', prefix.bin) install('dwarfdump.conf', prefix.lib) - install('dwarfdump.1', prefix.man1) + install('dwarfdump.1', prefix.man.man1) diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 1cfb4f59c9..b6da9e6ea9 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -57,14 +57,14 @@ class Mercurial(PythonPackage): prefix = self.prefix # Install man pages - mkdirp(prefix.man1) - mkdirp(prefix.man5) - mkdirp(prefix.man8) + mkdirp(prefix.man.man1) + mkdirp(prefix.man.man5) + mkdirp(prefix.man.man8) with working_dir('doc'): - install('hg.1', prefix.man1) - install('hgignore.5', prefix.man5) - install('hgrc.5', prefix.man5) - install('hg-ssh.8', prefix.man8) + install('hg.1', prefix.man.man1) + install('hgignore.5', prefix.man.man5) + install('hgrc.5', prefix.man.man5) + install('hg-ssh.8', prefix.man.man8) # Install completion scripts contrib = join_path(prefix, 'contrib') diff --git a/var/spack/repos/builtin/packages/pigz/package.py b/var/spack/repos/builtin/packages/pigz/package.py index e9fe482c51..36afbaa9bf 100644 --- a/var/spack/repos/builtin/packages/pigz/package.py +++ b/var/spack/repos/builtin/packages/pigz/package.py @@ -41,6 +41,6 @@ class Pigz(MakefilePackage): def install(self, spec, prefix): mkdirp(prefix.bin) - mkdirp(prefix.man1) + mkdirp(prefix.man.man1) install('pigz', "%s/pigz" % prefix.bin) - install('pigz.1', "%s/pigz.1" % prefix.man1) + install('pigz.1', "%s/pigz.1" % prefix.man.man1) diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py index ab768767f9..b1aaad0eb6 100644 --- a/var/spack/repos/builtin/packages/scotch/package.py +++ b/var/spack/repos/builtin/packages/scotch/package.py @@ -249,4 +249,4 @@ class Scotch(Package): install_tree('bin', prefix.bin) install_tree('lib', prefix.lib) install_tree('include', prefix.include) - install_tree('man/man1', prefix.share_man1) + install_tree('man/man1', prefix.share.man.man1) |