X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fsharedlibrary.cpp;h=b1ad358fdbc675a3113333a6eaae5bcbcfd8f921;hb=68517b5732dd29d9fa35086f184b4bd3bc99b45b;hp=24e0e205682acec12951035b32d84bc26a9a0ece;hpb=8932cbfa8cdb0b9edf9894bd4c56980dab0a2f4b;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 24e0e20..b1ad358 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -22,10 +22,7 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 {
 	install_location = "lib";
 	if(component->get_type()==Component::MODULE)
-	{
-		install_location += '/';
-		install_location += package->get_name();
-	}
+		install_location /= package->get_name();
 
 	const string &version = component->get_package().get_version();
 	if(!version.empty())
@@ -35,7 +32,14 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 			if(version[i]=='.' && ++dots>=2)
 				break;
 
-		soname = format("%s.%s", FS::basename(path), version.substr(0, i));
+		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.substr(0, i)));
+		else
+			soname = format("%s.%s", pattern.apply(component->get_name()), version.substr(0, i));
+
+		install_filename = soname;
 	}
 }