From 165dbf719db36bcc0dc2131b83b15a4cc9555ecf Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Mon, 21 Sep 2020 11:19:06 -0600
Subject: [PATCH] fix spack-build usages (#18846)
---
var/spack/repos/builtin/packages/branson/package.py | 2 +-
var/spack/repos/builtin/packages/hacckernels/package.py | 2 +-
var/spack/repos/builtin/packages/kripke/package.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/var/spack/repos/builtin/packages/branson/package.py b/var/spack/repos/builtin/packages/branson/package.py
index ffa9df0a84..a5489668c3 100644
--- a/var/spack/repos/builtin/packages/branson/package.py
+++ b/var/spack/repos/builtin/packages/branson/package.py
@@ -42,6 +42,6 @@ def cmake_args(self):
def install(self, spec, prefix):
mkdir(prefix.bin)
mkdir(prefix.doc)
- install('../spack-build/BRANSON', prefix.bin)
+ install(join_path(self.build_directory, 'BRANSON'), prefix.bin)
install('LICENSE.md', prefix.doc)
install('README.md', prefix.doc)
diff --git a/var/spack/repos/builtin/packages/hacckernels/package.py b/var/spack/repos/builtin/packages/hacckernels/package.py
index b15e2ac9cb..9322819802 100644
--- a/var/spack/repos/builtin/packages/hacckernels/package.py
+++ b/var/spack/repos/builtin/packages/hacckernels/package.py
@@ -23,4 +23,4 @@ class Hacckernels(CMakePackage):
def install(self, spec, prefix):
mkdirp(prefix.bin)
install('README', prefix)
- install('../spack-build/HACCKernels', prefix.bin)
+ install(join_path(self.build_directory, 'HACCKernels'), prefix.bin)
diff --git a/var/spack/repos/builtin/packages/kripke/package.py b/var/spack/repos/builtin/packages/kripke/package.py
index cd605fda3c..86a347c66a 100644
--- a/var/spack/repos/builtin/packages/kripke/package.py
+++ b/var/spack/repos/builtin/packages/kripke/package.py
@@ -42,4 +42,4 @@ def install(self, spec, prefix):
# Kripke does not provide install target, so we have to copy
# things into place.
mkdirp(prefix.bin)
- install('../spack-build/bin/kripke.exe', prefix.bin)
+ install(join_path(self.build_directory, 'bin/kripke.exe'), prefix.bin)
--
GitLab