From a0c9d89a42d9260266f4ef9a09552d3bfc93f7f0 Mon Sep 17 00:00:00 2001
From: Debian <admin@ip-10-51-162-143.ec2.internal>
Date: Thu, 2 Apr 2015 12:04:57 +0000
Subject: More fiddling with bjam.

---
 jam-files/curlpp.jam   | 5 +++--
 jam-files/xmlrpc-c.jam | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'jam-files')

diff --git a/jam-files/curlpp.jam b/jam-files/curlpp.jam
index b9d2823e4..757891a8b 100644
--- a/jam-files/curlpp.jam
+++ b/jam-files/curlpp.jam
@@ -76,9 +76,10 @@ else
 	# }
 	# else
 	# {
-	  external-lib $(libname) ; 
+	  external-lib $(libname) : $(cpp-prefix)/lib ; 
 	# }
-        requirements += <library>$(libname)/<link>shared ; 
+	requirements += <library>$(libname)/<link>shared ; 
+	# requirements += <library>$(libname) ; 
       }
       else
       {
diff --git a/jam-files/xmlrpc-c.jam b/jam-files/xmlrpc-c.jam
index a04ed1e1c..093bc807d 100644
--- a/jam-files/xmlrpc-c.jam
+++ b/jam-files/xmlrpc-c.jam
@@ -76,8 +76,8 @@ else
     local libname = [ MATCH "-l(xmlrpc.*)" : $(i) ] ; 
     if $(libname) 
     {   
-      external-lib $(libname) 
-      : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ;
+      external-lib $(libname) : $(prefix)/lib ;
+      #      : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ;
       requirements += <library>$(libname) ;
     }
     local pathname = [ MATCH "-L(.*)" : $(i) ] ; 
-- 
cgit v1.2.3