Add and improve build signatures for some tools

[builder.git] / source / sharedlibrary.cpp

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 06a99442b2fb47377044546d1646d7d599da5dcb..ae44f2cd5751701dff67a5e18dc29183960adb6b 100644 (file)
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -22,7 +22,10 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
        libname(c.get_name()),
        import_lib(0)
 {
-       install_location = "lib";
+       if(builder.get_current_arch().get_system()=="windows")
+               install_location = "bin";
+       else
+               install_location = "lib";
        if(component->get_type()==Component::MODULE)
                install_location /= package->get_name();
 
@@ -33,6 +36,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
                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 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);
+               }
                else
                        soname = format("%s.%s", pattern.apply(component->get_name()), version);