path(a),
size(0)
{
- builder.register_path(path, this);
+ builder.get_vfs().register_path(path, this);
if(FS::Stat st = FS::lstat(path))
{
mark_rebuild("Does not exist");
else
{
- for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+ for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
{
FileTarget *ft = dynamic_cast<FileTarget *>(*i);
if(ft && ft->get_mtime()>mtime)
{
if(const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(pkg))
{
- FS::Path relpath = FS::relative(pth, spkg->get_source());
- return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+ if(FS::descendant_depth(pth, spkg->get_source())>=0)
+ {
+ FS::Path relpath = FS::relative(pth, spkg->get_source());
+ return format("<%s>%s", pkg->get_name(), relpath.str().substr(1));
+ }
+ else if(FS::descendant_depth(pth, pkg->get_builder().get_prefix())>=0)
+ {
+ FS::Path relpath = FS::relative(pth, pkg->get_builder().get_prefix());
+ return "<prefix>"+relpath.str().substr(1);
+ }
}
- else
- return pth.str();
+
+ return pth.str();
}