X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=b2487537369076f705b136a1023371f9a9cf7356;hb=cbc6c684472ee8120f29358c0167d98524f1f939;hp=76e7b69456010b8dd30d233a5d4d23f384ffbb1f;hpb=0dea0d850f6690de07933794592916d11c9d3f49;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 76e7b69..b248753 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -13,12 +13,16 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 {
 	add_dependency(source);
 
-	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
-		if(!shlib->get_soname().empty())
-			link = FS::dirname(path)/FS::basename(shlib->get_path());
-
-	if(!link.empty())
+	/* XXX Ideally, the tool should handle this (symlinks are not necessary for
+	windows dlls).  However, the tool that created the target being installed
+	knows nothing about the InstalledFile. */
+	string base_fn = FS::basename(source.get_path());
+	const string &inst_fn = source.get_install_filename();
+	if(!inst_fn.empty() && inst_fn!=base_fn)
+	{
+		link = FS::dirname(path)/base_fn;
 		builder.get_vfs().register_path(link, this);
+	}
 }
 
 FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
@@ -34,10 +38,9 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	else
 		mid = tgt.get_install_location();
 
-	string fn = FS::basename(tgt.get_path());
-	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&tgt))
-		if(!shlib->get_soname().empty())
-			fn = shlib->get_soname();
+	string fn = tgt.get_install_filename();
+	if(fn.empty())
+		fn = FS::basename(tgt.get_path());
 
 	return prefix/mid/fn;
 }