- Target *hdr2=builder.get_header(*i, path, comp.get_build_info().incpath);
- if(hdr2 && !contains(depends, hdr2))
- add_depend(hdr2);
+ /* The target has been displaced by installing it. Displace any
+ dependencies that come from the same package as well. */
+ const SourcePackage *tpkg = rtgt->get_package();
+ for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
+ {
+ FileTarget *file = dynamic_cast<FileTarget *>(*i);
+ if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source_directory())>=0)
+ {
+ FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
+ if(Target *ddep = builder.get_vfs().get_target(displaced))
+ deps_to_add.push_back(ddep);
+ }
+ else
+ deps_to_add.push_back(*i);
+ }