From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 20 Jul 2012 20:49:51 +0000 (+0300)
Subject: Make bootstrap.sh create the staging include directory in temp
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=55ff56e7c48f14d0f73a253eccaeaae3d640ecfc;p=builder.git

Make bootstrap.sh create the staging include directory in temp
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 0bf6c3d..810ac12 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,8 +3,9 @@
 
 set -e
 
+INCLUDEDIR=temp/bootstrap/include
 REQUIRED="core datafile"
-CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
+CFLAGS="-I$INCLUDEDIR `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
 MACHINE="`uname -m`"
 if [ "$MACHINE" = "x86_64" ]; then
@@ -19,8 +20,8 @@ if [ -z "$LIBPATH" -o "${LIBPATH%%/*}" ]; then
 	LIBPATH=`pwd`/${LIBPATH:-..}
 fi
 
-rm -rf include
-mkdir -p include/msp
+rm -rf "$INCLUDEDIR"
+mkdir -p "$INCLUDEDIR/msp"
 
 sources=source/*.cpp
 
@@ -31,9 +32,9 @@ for i in $REQUIRED; do
 		missing="$missing msp$i"
 	else
 		if [ $i = "core" ]; then
-			ln -sf $path/source/* include/msp/
+			ln -sf $path/source/* "$INCLUDEDIR/msp/"
 		else
-			ln -sf $path/source include/msp/$i
+			ln -sf $path/source "$INCLUDEDIR/msp/$i"
 		fi
 		sources="$sources `find $path/source -name '*.cpp'`"
 	fi