From 47fd9e6dc6303f57ed1160953dfc3f0859140420 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 10 Aug 2013 09:52:10 +0200
Subject: [PATCH] rule AddLibrariesToContainer: fix for gristed libraries

---
 build/jam/ImageRules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 09a0a93598..efe95e5a1a 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -546,11 +546,11 @@ rule AddLibrariesToContainer container : directory : libs
 	for lib in $(libs) {
 		local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
 		if $(abiVersion) {
-			local abiVersionedLib = $(lib).$(abiVersion) ;
+			local abiVersionedLib = $(lib:G=).$(abiVersion) ;
 			AddFilesToContainer $(container) : $(directory) : $(lib)
 				: $(abiVersionedLib) ;
 			AddSymlinkToContainer $(container) : $(directory)
-				: $(abiVersionedLib) : $(lib) ;
+				: $(abiVersionedLib) : $(lib:G=) ;
 		} else {
 			AddFilesToContainer $(container) : $(directory) : $(lib) ;
 		}