- string fn = FS::basepart(src)+".o";
- if(!fn.compare(0, 2, "./"))
- fn.erase(0, 2);
- for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
- if(*i=='/')
- *i = '_';
- return pkg.get_temp_dir()/comp.get_name()/fn;
+ FS::Path rel_src = FS::relative(src, pkg.get_source_directory()).str();
+ string fn;
+ for(FS::Path::Iterator i=rel_src.begin(); i!=rel_src.end(); ++i)
+ {
+ if(!fn.empty())
+ fn += '_';
+ if(*i!=".")
+ fn += *i;
+ }
+ return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(fn)+".o");