X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=3f8b004ce172af9a96b36ee6af13d7a586c6de75;hb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;hp=93d450b4a47372297e6da6c797006837b4c4e277;hpb=4ce2beaa6d1cab7ed8063bbe1472e13a4280ebc0;p=builder.git

diff --git a/source/component.cpp b/source/component.cpp
index 93d450b..3f8b004 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -30,13 +30,10 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 	deflt(true)
 { }
 
-void Component::configure(const StringMap &opts, unsigned flag)
+void Component::prepare()
 {
-	for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i)
-		*i = (pkg.get_source()/pkg.expand_string(*i)).str();
-
 	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-		(*i)->configure(opts, flag&2);
+		(*i)->prepare();
 }
 
 void Component::create_build_info()
@@ -249,7 +246,7 @@ Component::Loader::Loader(Component &c):
 
 void Component::Loader::source(const string &s)
 {
-	obj.sources.push_back(s);
+	obj.sources.push_back((obj.pkg.get_source()/s).str());
 }
 
 void Component::Loader::require(const string &n)