From 93e288859adc8e14ab9f7fde9d842f185f0d4954 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 6 Jan 2014 14:14:57 +0100
Subject: [PATCH] Simpler prefix args.

---
 lib/spack/spack/packages/callpath.py  | 2 +-
 lib/spack/spack/packages/cmake.py     | 4 ++--
 lib/spack/spack/packages/dyninst.py   | 2 +-
 lib/spack/spack/packages/libdwarf.py  | 4 ++--
 lib/spack/spack/packages/libelf.py    | 2 +-
 lib/spack/spack/packages/libunwind.py | 2 +-
 lib/spack/spack/packages/mpich.py     | 2 +-
 lib/spack/spack/packages/mpileaks.py  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/spack/spack/packages/callpath.py b/lib/spack/spack/packages/callpath.py
index 3d79940b6e..689cdb832d 100644
--- a/lib/spack/spack/packages/callpath.py
+++ b/lib/spack/spack/packages/callpath.py
@@ -8,6 +8,6 @@ class Callpath(Package):
     depends_on("mpi")
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=" + prefix)
         make()
         make("install")
diff --git a/lib/spack/spack/packages/cmake.py b/lib/spack/spack/packages/cmake.py
index 3ee294b134..3d98567f71 100644
--- a/lib/spack/spack/packages/cmake.py
+++ b/lib/spack/spack/packages/cmake.py
@@ -6,7 +6,7 @@ class Cmake(Package):
     versions  = { '2.8.10.2' : '097278785da7182ec0aea8769d06860c' }
 
     def install(self, spec, prefix):
-        configure('--prefix=%s'   % prefix,
-                  '--parallel=%s' % make_jobs)
+        configure('--prefix='   + prefix,
+                  '--parallel=' + make_jobs)
         make()
         make('install')
diff --git a/lib/spack/spack/packages/dyninst.py b/lib/spack/spack/packages/dyninst.py
index 187cc2bb5a..20dbddeb7a 100644
--- a/lib/spack/spack/packages/dyninst.py
+++ b/lib/spack/spack/packages/dyninst.py
@@ -12,6 +12,6 @@ class Dyninst(Package):
     depends_on("libdwarf")
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=" + prefix)
         make()
         make("install")
diff --git a/lib/spack/spack/packages/libdwarf.py b/lib/spack/spack/packages/libdwarf.py
index 3102c3d4dd..3fd727257d 100644
--- a/lib/spack/spack/packages/libdwarf.py
+++ b/lib/spack/spack/packages/libdwarf.py
@@ -31,7 +31,7 @@ def install(self, spec, prefix):
         mkdirp(prefix.bin, prefix.include, prefix.lib, prefix.man1)
 
         with working_dir('libdwarf'):
-            configure("--prefix=%s" % prefix, '--enable-shared')
+            configure("--prefix=" + prefix, "--enable-shared")
             make()
 
             install('libdwarf.a',  prefix.lib)
@@ -40,7 +40,7 @@ def install(self, spec, prefix):
             install('dwarf.h',     prefix.include)
 
         with working_dir('dwarfdump2'):
-            configure("--prefix=%s" % prefix)
+            configure("--prefix=" + prefix)
 
             # This makefile has strings of copy commands that
             # cause a race in parallel
diff --git a/lib/spack/spack/packages/libelf.py b/lib/spack/spack/packages/libelf.py
index ec2c4a6c0f..1ef911d6c8 100644
--- a/lib/spack/spack/packages/libelf.py
+++ b/lib/spack/spack/packages/libelf.py
@@ -13,7 +13,7 @@ class Libelf(Package):
                  '0.8.12' : 'e21f8273d9f5f6d43a59878dc274fec7', }
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
+        configure("--prefix=" + prefix,
                   "--enable-shared",
                   "--disable-dependency-tracking",
                   "--disable-debug")
diff --git a/lib/spack/spack/packages/libunwind.py b/lib/spack/spack/packages/libunwind.py
index 0366ebefba..817ead97da 100644
--- a/lib/spack/spack/packages/libunwind.py
+++ b/lib/spack/spack/packages/libunwind.py
@@ -7,6 +7,6 @@ class Libunwind(Package):
     versions = { '1.1' : 'fb4ea2f6fbbe45bf032cd36e586883ce' }
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=" + prefix)
         make()
         make("install")
diff --git a/lib/spack/spack/packages/mpich.py b/lib/spack/spack/packages/mpich.py
index a21db55fe8..897a11c564 100644
--- a/lib/spack/spack/packages/mpich.py
+++ b/lib/spack/spack/packages/mpich.py
@@ -14,6 +14,6 @@ class Mpich(Package):
     provides('mpi@:1', when='@1:')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=" + prefix)
         make()
         make("install")
diff --git a/lib/spack/spack/packages/mpileaks.py b/lib/spack/spack/packages/mpileaks.py
index 25036a0d53..28124911b4 100644
--- a/lib/spack/spack/packages/mpileaks.py
+++ b/lib/spack/spack/packages/mpileaks.py
@@ -8,6 +8,6 @@ class Mpileaks(Package):
     depends_on("callpath")
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure("--prefix=" + prefix)
         make()
         make("install")