X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstalledfile.cpp;h=76e7b69456010b8dd30d233a5d4d23f384ffbb1f;hb=08015c0f27f377fcd4aa186fca5bd8cf70723a5a;hp=f2909f6127ec94d72f475ed200a9182276fd4742;hpb=9134ce7f2225eb301c7b6c9aca8521c4e82dc065;p=builder.git diff --git a/source/installedfile.cpp b/source/installedfile.cpp index f2909f6..76e7b69 100644 --- a/source/installedfile.cpp +++ b/source/installedfile.cpp @@ -11,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(&source)) if(!shlib->get_soname().empty()) @@ -55,6 +55,22 @@ 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"); + if(!needs_rebuild() && !link.empty()) + { + if(!FS::exists(link)) + mark_rebuild("Symlink does not exist"); + else + { + FS::Path rel_path = FS::relative(path, FS::dirname(link)); + if(FS::readlink(link)!=rel_path) + mark_rebuild("Symlink needs updating"); + } + } +} + +void InstalledFile::clean() +{ + if(!link.empty() && mtime) + FS::unlink(link); + FileTarget::clean(); }