X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=ef0e60cbb7b2a3373dea85d6da7e50a5426ac6bd;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=ef4fd5760a26fd1a90f7fb077d3256612c4b9fca;hpb=b50019441dd16d4aaba1eeffc381ded3e4a4be2d;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ef4fd57..ef0e60c 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -30,7 +30,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
 
 Msp::Path SourcePackage::get_temp_dir() const
 {
-	return source/config.get_option("tempdir").value/config.get_option("profile").value;
+	return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
 }
 
 Msp::Path SourcePackage::get_out_dir() const
@@ -143,21 +143,8 @@ void SourcePackage::init_config()
 	config.add_option("strip",      "0",       "Strip symbols from programs");
 	config.add_option("debug",      "0",       "Produce debugging symbols");
 	config.add_option("cpu",        "auto",    "CPU type to optimize for");
-	config.add_option("arch",       "native",  "Architecture for cross-compiling");
 	config.add_option("staticlibs", "local",   "Use static libraries");
 
-	unsigned flags=get_install_flags();
-	if(flags)
-		config.add_option("prefix",     "$HOME/local",     "Installation prefix");
-	/*if(flags&INCLUDE)
-		config.add_option("includedir", "$prefix/include", "Header installation directory");
-	if(flags&BIN)
-		config.add_option("includedir", "$prefix/bin",     "Binary installation directory");
-	if(flags&LIB)
-		config.add_option("includedir", "$prefix/lib",     "Library installation directory");
-	if(flags&DATA)
-		config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
-
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		config.add_option("with_"+i->name, "0", i->descr);
 
@@ -194,10 +181,13 @@ void SourcePackage::create_build_info()
 
 	unsigned flags=get_install_flags();
 
+	build_info.incpath.push_back((Path(builder.get_prefix())/"include").str());
+	build_info.libpath.push_back((Path(builder.get_prefix())/"lib").str());
+
 	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((Path(config.get_option("prefix").value)/"include").str());
+		export_binfo.incpath.push_back((Path(builder.get_prefix())/"include").str());
 	if(flags&LIB)
-		export_binfo.libpath.push_back((Path(config.get_option("prefix").value)/"lib").str());
+		export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str());
 
 	string optimize=config.get_option("optimize").value;
 	if(lexical_cast<unsigned>(optimize))