X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=6960ccead45599ca62cbc0f1302076fe80bd7682;hb=1dbeace0c44127bee08a3a8b231f4c8dcf707b2c;hp=0928386c092c24f6dba4b7d1f0c7999d385c41c7;hpb=968db78efd29b1f4890068693728299b2c7c92c7;p=builder.git

diff --git a/source/installedfile.cpp b/source/installedfile.cpp
index 0928386..6960cce 100644
--- a/source/installedfile.cpp
+++ b/source/installedfile.cpp
@@ -1,3 +1,4 @@
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "installedfile.h"
@@ -10,7 +11,7 @@ InstalledFile::InstalledFile(Builder &b, const SourcePackage &p, FileTarget &s,
 	FileTarget(b, p, generate_target_path(b.get_prefix(), s, loc)),
 	source(s)
 {
-	add_depend(&source);
+	add_dependency(source);
 
 	if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&source))
 		if(!shlib->get_soname().empty())
@@ -25,13 +26,20 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileT
 	if(!tgt.is_installable() && loc.empty())
 		throw invalid_argument(tgt.get_name()+" is not installable");
 
-	string mid;
+	FS::Path mid;
 	if(!loc.empty())
 		mid = loc;
+	else if(const Component *comp = tgt.get_component())
+		mid = comp->get_install_map().get_install_location(tgt);
 	else
 		mid = tgt.get_install_location();
 
-	return prefix/mid/FS::basename(tgt.get_path());
+	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();
+
+	return prefix/mid/fn;
 }
 
 Target *InstalledFile::get_real_target()
@@ -47,4 +55,6 @@ void InstalledFile::check_rebuild()
 		mark_rebuild(source.get_name()+" has changed");
 	else if(source.needs_rebuild())
 		mark_rebuild(source.get_name()+" needs rebuilding");
+	else if(!link.empty() && !FS::exists(link))
+		mark_rebuild("Symlink does not exist");
 }