-REQUIRED="core datafile path strings io"
-CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
-LIBS="`pkg-config --libs sigc++-2.0` -lpthread -ldl"
-if [ -z "$LIBPATH" ]; then
- LIBPATH=`pwd`/..
+set -e
+
+INCLUDEDIR=temp/bootstrap/include
+REQUIRED="core datafile"
+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
+ 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"