From 25c9a5216f2b0b6452f8bbc2e501dcf1a6428305 Mon Sep 17 00:00:00 2001
From: Levi Baber <baberlevi@gmail.com>
Date: Mon, 9 Jul 2018 13:21:38 -0500
Subject: [PATCH] express: bamtools lib handling (#8552)

* express: bamtools lib handling

* express: use libs property

* express: remove old comment
---
 var/spack/repos/builtin/packages/express/package.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py
index cfc83ec44c0..6d792f5479f 100644
--- a/var/spack/repos/builtin/packages/express/package.py
+++ b/var/spack/repos/builtin/packages/express/package.py
@@ -52,11 +52,8 @@ def patch(self):
                     edit.filter('#include <api', '#include <%s' % self.spec[
                                 'bamtools'].prefix.include.bamtools.api)
             edit = FileFilter('CMakeLists.txt')
-            # really ugly way to escape the $ in CMakeLists.txt
-            edit.filter('{CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/'
-                        'libbamtools.a', '$')
-            edit.filter('\\$\\$', '%s' % join_path(self.spec[
-                        'bamtools'].prefix.lib.bamtools, 'libbamtools.a'))
+            edit.filter('\${CMAKE_CURRENT_SOURCE_DIR}/../bamtools/lib/'
+                        'libbamtools.a', '%s' % self.spec['bamtools'].libs)
 
     def setup_environment(self, spack_env, run_env):
         spack_env.prepend_path('CPATH', self.spec[