From 426405195454b1f40a3a62483bd985a122c504d3 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 8 Feb 2017 03:22:52 +0100 Subject: fix usage of self.build_directory in espressopp and astyle (#3053) --- var/spack/repos/builtin/packages/astyle/package.py | 2 +- var/spack/repos/builtin/packages/espressopp/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py index 851952be66..5598373b44 100644 --- a/var/spack/repos/builtin/packages/astyle/package.py +++ b/var/spack/repos/builtin/packages/astyle/package.py @@ -44,7 +44,7 @@ class Astyle(MakefilePackage): return join_path(self.stage.source_path, 'build', self.compiler.name) def edit(self, spec, prefix): - makefile = join_path(self.build_directory(), 'Makefile') + makefile = join_path(self.build_directory, 'Makefile') filter_file(r'^CXX\s*=.*', 'CXX=%s' % spack_cxx, makefile) # strangely enough install -o $(USER) -g $(USER) stoped working on OSX if sys.platform == 'darwin': diff --git a/var/spack/repos/builtin/packages/espressopp/package.py b/var/spack/repos/builtin/packages/espressopp/package.py index 2903a02f7d..06974a38d8 100644 --- a/var/spack/repos/builtin/packages/espressopp/package.py +++ b/var/spack/repos/builtin/packages/espressopp/package.py @@ -72,7 +72,7 @@ class Espressopp(CMakePackage): return ['-DEXTERNAL_MPI4PY=ON', '-DEXTERNAL_BOOST=ON'] def build(self, spec, prefix): - with working_dir(self.build_directory()): + with working_dir(self.build_directory): make() if '+ug' in spec: make("ug", parallel=False) -- cgit v1.2.3-60-g2f50