Initialize Component::install to false

Don't throw for packages with no installable components
Don't create spurious symlinks in bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 93ee706b1ccf47772d4e6af96005f735a7f06a16..cd94382884dd6614cd9daa374acf982092d91ef8 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -18,12 +18,12 @@ for i in $REQUIRED; do
                exit 1
        fi
        if [ $i = "core" ]; then
-               ln -sf $path/source/core include/msp/core
-               ln -sf $path/source/time include/msp/time
+               ln -sfT $path/source/core include/msp/core
+               ln -sfT $path/source/time include/msp/time
        elif [ $i = "misc" ]; then
                ln -sf $path/source/*.h include/msp
        else
-               ln -sf $path/source include/msp/$i
+               ln -sfT $path/source include/msp/$i
        fi
        sources="$sources `find $path/source -name '*.cpp'`"
 done

diff --git a/source/builder.cpp b/source/builder.cpp
index b90f2c4153651628c04ffbf552c9450095931110..2c137ca406841a1159269851f8177261504c91c9 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -301,6 +301,10 @@ int Builder::create_targets()
                if(!i->second->get_buildable())
                        continue;
 
+               Path::Path inst_base;
+               if(i->second->get_config().is_option("prefix"))
+                       inst_base=i->second->get_config().get_option("prefix").value;
+
                const ComponentList &components=i->second->get_components();
                for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
                {
@@ -313,8 +317,6 @@ int Builder::create_targets()
                                        files.push_back(*k / *l);
                        }
 
-                       Path::Path inst_base=i->second->get_config().get_option("prefix").value;
-
                        bool build_exe=j->get_type()!=Component::HEADERS;
                        
                        list<ObjectFile *> objs;

diff --git a/source/component.cpp b/source/component.cpp
index 38f4d6b4279ccfc897ef6392565c4670857c51d7..1274a75c12d283ebbe234adabffcafd35b846de1 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -6,7 +6,8 @@ using namespace std;
 Component::Component(Package &p, Type t, const string &n):
        pkg(p),
        type(t),
-       name(n)
+       name(n),
+       install(false)
 { }
 
 void Component::create_build_info()