X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=5e479f3c9f652f64c03a9ab3eb472ae645c807ed;hp=c25c6f213f3e7c791525aad240259384335c60ac;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hpb=9dd42116ce72f8b2288ab535f89242f87a44337a

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index c25c6f2..5e479f3 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -37,18 +37,12 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 		if(!version.empty())
 		{
 			const Architecture &arch = builder.get_current_arch();
-			const Pattern &pattern = arch.get_shared_library_patterns().front();
 			if(arch.get_system()=="windows")
-				soname = pattern.apply(format("%s-%s", component->get_name(), version));
+				soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, version));
 			else if(arch.get_system()=="darwin")
-			{
-				string filename = pattern.apply(component->get_name());
-				string base = FS::basepart(filename);
-				string ext = FS::extpart(filename);
-				soname = format("%s.%s%s", base, version, ext);
-			}
+				soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
 			else
-				soname = format("%s.%s", pattern.apply(component->get_name()), version);
+				soname = format("%s.%s", arch.create_filename<SharedLibrary>(libname), version);
 
 			install_filename = soname;
 		}
@@ -66,7 +60,7 @@ string SharedLibrary::generate_filename(const Component &comp)
 	else
 	{
 		const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-		return arch.get_shared_library_patterns().front().apply(comp.get_name());
+		return arch.create_filename<SharedLibrary>(comp.get_name());
 	}
 }