add_dependency(source);
}
-FS::Path InstalledFile::generate_target_path(const FS::Path &prefix, const FileTarget &tgt, const string &loc)
+FS::Path InstalledFile::generate_target_path(const FS::Path &global_prefix, const FileTarget &tgt, const string &loc)
{
if(!tgt.is_installable() && loc.empty())
throw invalid_argument(tgt.get_name()+" is not installable");
+ FS::Path prefix;
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);
+ if(!loc.compare(0, 2, "//"))
+ {
+ if(!tgt.get_package())
+ throw invalid_argument("No private install location for "+tgt.get_name());
+
+ prefix = tgt.get_package()->get_temp_directory();
+ mid = loc.substr(2);
+ }
else
+ {
+ prefix = global_prefix;
+
+ if(!loc.empty())
+ mid = loc;
+ else if(const Component *comp = tgt.get_component())
+ mid = comp->get_install_map().get_install_location(tgt);
+ }
+
+ if(mid.empty())
mid = tgt.get_install_location();
string fn = tgt.get_install_filename();
void InstalledFile::set_symlink(const FS::Path &l)
{
+ FS::Path al = FS::dirname(path)/l;
+ if(al==path)
+ throw invalid_argument("InstalledFile::set_symlink");
link = FS::dirname(path)/l;
builder.get_vfs().register_path(link, this);
}