From 05aafad32a76aa43b95f0e1141027d0ebfc1b07e Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 15 Aug 2008 17:49:19 +0000 Subject: [PATCH] Make bootstrap.sh more POSIX compliant --- bootstrap.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 362343a..cdaeee6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -5,29 +5,33 @@ set -e REQUIRED="core datafile fs 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`/.. +LIBS="`pkg-config --libs sigc++-2.0` -lpthread" +if [ -e /usr/lib/libdl.so ]; then + LIBS="$LIBS -ldl" +fi +if [ -z "$LIBPATH" -o "${LIBPATH%%/*}" ]; then + LIBPATH=`pwd`/${LIBPATH:-..} fi -LIBPATH=`readlink -f $LIBPATH` - +rm -rf include mkdir -p include/msp sources=source/*.cpp for i in $REQUIRED; do - path=`ls -1d $LIBPATH/*$i* 2>/dev/null | head -1` - if [ ! -d $path ]; then + path=`ls -1d $LIBPATH/*$i* 2>/dev/null | head -n1` + if [ -z "$path" ]; then echo msp$i missing exit 1 fi if [ $i = "core" ]; then - ln -sf $path/source/* -t include/msp + ln -sf $path/source/* include/msp/ else - ln -sfT $path/source include/msp/$i + ln -sf $path/source include/msp/$i fi sources="$sources `find $path/source -name '*.cpp'`" done +echo "Compiling builder-stage1. This may take several minutes." g++ $sources -o builder-stage1 $CFLAGS $LIBS +echo "Done." -- 2.45.2