Variables in Build files weren't such a hot idea. KISS.

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 93d450b4a47372297e6da6c797006837b4c4e277..3ce6b14297a40bfb774846d4133e4bac389edeb5 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -32,9 +32,6 @@ Component::Component(SourcePackage &p, Type t, const string &n):
 
 void Component::configure(const StringMap &opts, unsigned flag)
 {
-       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);
 }
@@ -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)