X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=contrib%2Fplatformtest.sh;h=1067a6e907d832af714db43fa14c11ebf03bb82c;hp=dfefc1aa507d0742bf3c4876cd7c10f826a11b71;hb=2560e5f1560b6b4a225e77de67876a588543c53d;hpb=97b4fd8a086af9d4a979e8fa3a714352fcffdca3

diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh
index dfefc1aa..1067a6e9 100755
--- a/contrib/platformtest.sh
+++ b/contrib/platformtest.sh
@@ -29,6 +29,9 @@ R_MAKE=
 R_CHECK=
 R_RUN=
 
+SRC_D=`dirname "$0"`
+MY_D="$PWD"
+
 [ -n "$MAKE" ] || MAKE="make"
 export MAKE CC
 
@@ -52,35 +55,41 @@ while [ $# -gt 0 ]; do
 done
 
 echo "$NAME: Checking ngIRCd base source directory ..."
-grep "ngIRCd" ./ChangeLog >/dev/null 2>&1
+grep "ngIRCd" "$SRC_D/ChangeLog" >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-	grep "ngIRCd" ../ChangeLog >/dev/null 2>&1
+	grep "ngIRCd" "$SRC_D/../ChangeLog" >/dev/null 2>&1
 	if [ $? -ne 0 ]; then
 		echo "$NAME: ngIRCd base source directory not found!?"
 		exit 1
 	fi
-	cd ..
+	SRC_D="$SRC_D/.."
 fi
+echo "$NAME:  - source directory: $SRC_D"
+echo "$NAME:  - working directory: $MY_D"
 
 echo "$NAME: Checking for GIT tree ..."
-if [ -d .git ]; then
+if [ -d "$SRC_D/.git" ]; then
 	echo "$NAME: Checking for \"git\" command ..."
 	git version >/dev/null 2>&1
 	if [ $? -eq 0 -a -n "$CLEAN" ]; then
 		echo "$NAME: Running \"git clean\" ..."
+		cd "$SRC_D" || exit 1
 		[ -n "$VERBOSE" ] && git clean -dxf || git clean -dxf >/dev/null
+		cd "$MY_D" || exit 1
 	fi
 fi
 
-echo "$NAME: Checking for \"./configure\" script ..."
-if [ ! -r ./configure ]; then
-	echo "$NAME: Running \"./autogen.sh\" ..."
+echo "$NAME: Checking for \"$SRC_D/configure\" script ..."
+if [ ! -r "$SRC_D/configure" ]; then
+	echo "$NAME: Running \"$SRC_D/autogen.sh\" ..."
+	cd "$SRC_D" || exit 1
 	[ -n "$VERBOSE" ] && ./autogen.sh || ./autogen.sh >/dev/null
+	cd "$MY_D" || exit 1
 fi
 
-if [ -r ./configure ]; then
-	echo "$NAME: Running \"./configure\" script ..."
-	[ -n "$VERBOSE" ] && ./configure || ./configure >/dev/null
+if [ -r "$SRC_D/configure" ]; then
+	echo "$NAME: Running \"$SRC_D/configure\" script ..."
+	[ -n "$VERBOSE" ] && "$SRC_D/configure" -C || "$SRC_D/configure" -C >/dev/null
 	if [ $? -eq 0 -a -r ./Makefile ]; then
 		R_CONFIGURE=1
 		echo "$NAME: Running \"$MAKE\" ..."
@@ -151,8 +160,8 @@ fi
 # Get ngIRCd version information
 eval $(grep "^VERSION = " Makefile | sed -e 's/ //g')
 case "$VERSION" in
-	*-*-*)
-		VERSION=`echo "$VERSION" | cut -d'-' -f3 | cut -b2-`
+	*~*-*)
+		VERSION=`echo "$VERSION" | cut -b1-10`
 		;;
 esac
 [ -n "$VERSION" ] || VERSION="unknown"