From a28c89a3edfd879920601d8bd15c867e1e53b4e9 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Thu, 26 Jul 2012 16:06:42 +0200
Subject: [PATCH] Fix a couple bugs in paths

---
 boost.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/boost.spec b/boost.spec
index 48c747b..0b8a99d 100644
--- a/boost.spec
+++ b/boost.spec
@@ -612,7 +612,7 @@ echo ============================= install $MPI_COMPILER ==================
     variant=release threading=multi debug-symbols=on pch=off stage
 
 # Remove generic parts of boost that were built for dependencies.
-rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/%{_lib}/libboost_{python,{w,}serialization}*
+rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
 
 %{_openmpi_unload}
 export PATH=/bin${PATH:+:}$PATH
@@ -627,7 +627,7 @@ echo ============================= install $MPI_COMPILER ==================
     variant=release threading=multi debug-symbols=on pch=off stage
 
 # Remove generic parts of boost that were built for dependencies.
-rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/%{_lib}/libboost_{python,{w,}serialization}*
+rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
 
 %{_mpich2_unload}
 export PATH=/bin${PATH:+:}$PATH
@@ -645,6 +645,7 @@ echo ============================= install serial ==================
 ./b2 -d+2 -q %{?_smp_mflags} --layout=tagged \
     --without-mpi --without-graph_parallel --build-dir=serial \
     --prefix=$RPM_BUILD_ROOT%{_prefix} \
+    --libdir=$RPM_BUILD_ROOT%{_libdir} \
     variant=release threading=single,multi debug-symbols=on pch=off install
 
 echo ============================= install Boost.Build ==================