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
@@ -74,136 +74,136 @@ while [ -n "$1" ]; do
 	;;
    -qconfig)
 	# optional way to specify the qconfig-qpe.h is to pass -qconfig qpe
 	shift; QCONFIGARG=DEFINES+=QCONFIG='\"'$1'\"' # Don't quote me on that.
 	;;
    -make)
 	shift; TOMAKE="$TOMAKE $1"
 	;;
    -qt3)
        QT3=yes
        ;;
     *)
 	HELP=yes;;
    esac
    shift
 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
 
 # Next, emit a usage message if something failed.
 
 if [ "$HELP" = "yes" ]; then
     cat <<EOF
 Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
 
 The defaults (*) are usually acceptable.  Here is a short explanation of
 each option:
 
  *  -release ........... Compile and link Qt with debugging turned off.
     -debug ............. Compile and link Qt with debugging turned on.
 
  *  -shared ............ Create and use a shared Qt library (libqt.so)
     -static ............ Create and use a static Qt library (libqt.a)
 
     -qt3 ............... Configure for use with Qt 3.x
 
     -platform target ... The platform you are building on ($PLATFORM)
 EOF
    exit 0;
 fi
 
 CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
 
 if [ -f library/custom-$CUSTOM.h ]
 then
     rm -f library/custom.h
     ln -s custom-$CUSTOM.h library/custom.h
 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 ]
 then
     VCONFIG="CONFIG+=qt3"
 else
     VCONFIG="CONFIG+=qt2"
 fi
 
 if [ -f $TMAKEPATH/tmake.conf ]
 then
     # You have tmake. We'll regenerate the file for you...
     echo "Makefiles will be regenerated."
 fi
 
 H=`pwd`
 if [ -z "$TOMAKE" ]
 then
     TOMAKE=`make showcomponents`
 fi
 
 for a in $TOMAKE ; do
     N=$a/Makefile
     M=$a/Makefile.in
     O=$a/Makefile.add
     f=`basename $a`
 
     if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ]
     then
 	(   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
 	fi
 	
     fi
 
     cat > $N <<EOF
 #############################################################################
 # Automatically generated from $M
 # Build options from $1
 #############################################################################
 
 EOF
 
     SED=
     PLATFORM_CFLAGS=
 
     if [ "$f" = "embeddedkonsole" ]