X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=3b0b296c2bdb1fb8f1955479f4f0929d15cc746e;hb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;hp=06ab5fe7441953a9652b9ae40b2c2df208755de9;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 06ab5fe..3b0b296 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -22,7 +22,7 @@ bool component_sort(const Component &c1, const Component &c2)
 
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
-	source(s),
+	source_dir(s),
 	build_type(0),
 	config(*this),
 	deps_cache(*this)
@@ -50,7 +50,7 @@ FS::Path SourcePackage::get_temp_dir() const
 	if(temp.is_absolute())
 		return temp/name/subdir;
 	else
-		return source/temp/subdir;
+		return source_dir/temp/subdir;
 }
 
 FS::Path SourcePackage::get_out_dir() const
@@ -58,9 +58,9 @@ FS::Path SourcePackage::get_out_dir() const
 	const Architecture &arch = builder.get_current_arch();
 	string detail = (build_type ? build_type->get_name() : string());
 	if(arch.is_native())
-		return source/detail;
+		return source_dir/detail;
 	else
-		return source/arch.get_name()/detail;
+		return source_dir/arch.get_name()/detail;
 }
 
 void SourcePackage::create_build_info()
@@ -113,7 +113,7 @@ void SourcePackage::create_targets()
 	if(pc_needed)
 	{
 		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-		builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+		builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
 	}
 }
 
@@ -169,7 +169,7 @@ void SourcePackage::Loader::finish()
 			{
 				if(!i->first.compare(0, k->size(), *k))
 				{
-					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source/i->first, i->second);
+					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second);
 				}
 			}
 		}
@@ -280,5 +280,5 @@ void SourcePackage::Loader::tar_file(const string &f)
 	IO::print("%s: Note: tar_file is deprecated\n", get_source());
 	for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
 		if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
-			const_cast<StringList &>(i->get_sources()).push_back((obj.source/f).str());
+			const_cast<StringList &>(i->get_sources()).push_back((obj.source_dir/f).str());
 }