X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;h=810ac1240882e883ef889960001ef1897fb304fd;hb=cbc6c684472ee8120f29358c0167d98524f1f939;hp=7b96c9639c1bf3aa58032e53cc04d13a79fe4cc9;hpb=ac6240aac62cec1fa7d019747fc40281de28a3ed;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 7b96c96..810ac12 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,18 +3,25 @@
 
 set -e
 
-REQUIRED="core datafile fs strings io"
-CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
+INCLUDEDIR=temp/bootstrap/include
+REQUIRED="core datafile"
+CFLAGS="-I$INCLUDEDIR `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
-if [ -e /usr/lib/libdl.so ]; then
+MACHINE="`uname -m`"
+if [ "$MACHINE" = "x86_64" ]; then
+	MULTIARCH="x86_64-linux-gnu"
+else
+	MULTIARCH="i386-linux-gnu"
+fi
+if [ -e /usr/lib/libdl.so -o -e /usr/lib/$MULTIARCH/libdl.so ]; then
 	LIBS="$LIBS -ldl"
 fi
 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
 
@@ -25,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