X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=c4f42e574ed7a484150966c063d9513d6bb72437;hb=632361796a7ddadf8a726526c937fab22281fb7b;hp=868e822159847deebf24a76ff23867442485c142;hpb=0458300fda4f345f865a7f3ee4fc0f2020a91983;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 868e822..c4f42e5 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,10 +1,4 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "component.h"
 #include "sharedlibrary.h"
@@ -18,7 +12,14 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 	Binary(b, c, objs),
 	Library(b, &c.get_package(), path, c.get_name()),
 	soname(create_soname(c))
-{ }
+{
+	install_location = "lib";
+	if(component->get_type()==Component::MODULE)
+	{
+		install_location += '/';
+		install_location += package->get_name();
+	}
+}
 
 string SharedLibrary::create_soname(const Component &c)
 {
@@ -36,5 +37,5 @@ string SharedLibrary::create_soname(const Component &c)
 				break;
 		}
 
-	return format("%s.%s", name, ver.substr(0, i));
+	return format("%s.%s", FS::basename(path), ver.substr(0, i));
 }