X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=56f9b32d3e09d5056717faf93d663b57d80648ec;hb=e15bd086a1ef924b7986d18a1c5b3d31f54a01de;hp=9b2fdbb1bd99b02bc3a99f877ec67779b4790c31;hpb=6f76342d14c7b7ec7b9629fcfd40199bca1e5e0f;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 9b2fdbb..56f9b32 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -24,15 +24,17 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 	if(component->get_type()==Component::MODULE)
 		install_location /= package->get_name();
 
-	const string &version = component->get_package().get_version();
+	const string &version = component->get_package().get_interface_version();
 	if(!version.empty())
 	{
-		string::size_type i = 0;
-		for(unsigned dots=0; i<version.size(); ++i)
-			if(version[i]=='.' && ++dots>=2)
-				break;
+		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));
+		else
+			soname = format("%s.%s", pattern.apply(component->get_name()), version);
 
-		soname = format("%s.%s", FS::basename(path), version.substr(0, i));
+		install_filename = soname;
 	}
 }