Fixed BLAS and Lapack installations

2 files changed, 7 insertions, 16 deletions

diff --git a/var/spack/packages/blas/package.py b/var/spack/packages/blas/package.py
index 7bab63bcd9..0cf495d0c1 100644
--- a/var/spack/packages/blas/package.py
+++ b/var/spack/packages/blas/package.py
@@ -12,10 +12,6 @@ class Blas(Package):
 
     def install(self, spec, prefix):    
         make()
-        mv = which('mv') # Create a shell wrapper for the mv command.
-        mkdir = which('mkdir') # Create a shell wrapper for the mkdir command.
-        pwd = os.getcwd() # Retrieve the current working dir.
-        mkdir('%s' % prefix.lib) # Create the lib dir inside the install dir.
-        mv('%s/blas_LINUX.a' % pwd, '%s/libblas.a' % pwd) # Rename the generated lib file to libblas.a
-        mv('%s/libblas.a' % pwd, '%s/libblas.a' % prefix.lib) # Move the library file to the install dir.
+        mkdirp('%s' % prefix.lib) # Create the lib dir inside the install dir.
+        move('./blas_LINUX.a', '%s/libblas.a' % prefix.lib) # Rename the generated lib file to libblas.a
         
diff --git a/var/spack/packages/lapack/package.py b/var/spack/packages/lapack/package.py
index f2dab5ecb6..de90acd742 100644
--- a/var/spack/packages/lapack/package.py
+++ b/var/spack/packages/lapack/package.py
@@ -12,20 +12,15 @@ class Lapack(Package):
 
     depends_on('blas')
 
-    def install(self, spec, prefix):
-        mv = which('mv') # Create a shell wrapper for the mv command.
-        mkdir = which('mkdir') # Create a shell wrapper for the mkdir command.
-        pwd = os.getcwd() # Retrieve the current working dir.
-
+    def install(self, spec, prefix):     
         # Lapack and BLAS testing fails for some reason, but the library is 
-        # built and ready to go at this point. The testing stuff is going to be 
-        # switched off for now.
+        # built and ready to go after make() is called. The testing stuff is 
+        # going to be switched off for now.
         filter_file('blas_testing lapack_testing ', ' ', 'Makefile', string=True)
-
-        mv('%s/make.inc.example' % pwd, '%s/make.inc' % pwd)
+        move('./make.inc.example', './make.inc')
         filter_file('../../librefblas.a', '%s/libblas.a' % spec['blas'].prefix.lib, 'make.inc', string=True) # Specify the BLAS lib to use.
 
         make()
         mkdir('%s' % prefix.lib) # Create the lib dir inside the install dir.
-        mv('%s/liblapack.a' % pwd, '%s/liblapack.a' % prefix.lib) # Move the library file to the install dir.
+        move('./liblapack.a', '%s/liblapack.a' % prefix.lib) # Move the library file to the install dir.