| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -82,32 +82,33 @@ while [ -n "$1" ]; do -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: @@ -126,33 +127,32 @@ EOF 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 @@ -169,33 +169,33 @@ 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 |