Major pro file overhaul from davipt. Commited by me, since it touches

many core files ... please report bugs on this to davipt

1 files changed, 2 insertions, 2 deletions

diff --git a/configure b/configure
index a9d229e..8b0f37e 100755
--- a/configure
+++ b/configure
@@ -90,16 +90,17 @@ done
 
 TARGET=configs/$PLATFORM-$SHARING$DEBUG
 
 if [ '!' -f $TARGET ]
 then
     if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ]
     then
 	TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG
+	PLATFORM=linux-$PLATFORM-g++
     else
 	echo
 	echo '    The specified platform/compiler not supported: ' $TARGET
 	echo
 	exit 2
     fi
 fi
 
@@ -134,17 +135,16 @@ then
 fi
 
 mkdir -p include/qpe
 ( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
 
 mkdir -p include/opie
 ( cd include/opie &&  rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
 
-
 echo Creating makefiles...
 
 # Set version for library directly
 # Version 1.5.0 right now for compat.
 sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
 mv library/library.pro-v library/library.pro
 
 if [ "$QT3" = yes ]
@@ -177,17 +177,17 @@ for a in $TOMAKE ; do
 	(   cd $a;
 	    TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
 		tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
 		    -t $H/qt/tmake/propagate.t $f.pro |
 		    sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
 	)
 	echo -n "."
 #	echo Building $N..
-	appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
+	appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"`
 	translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
 	if [ -n "$translation" -a -n "$appname" ]
 	then
 	    if [ "$appname" != "$translation" ]
 	    then 
 		echo
 		echo "Warning: translation and appname disagree in $a/$f.pro"
 	    fi