1 files changed, 12 insertions, 7 deletions

diff --git a/configure b/configure
index 7824e36..3b474c6 100755
--- a/configure
+++ b/configure
@@ -2,13 +2,13 @@
 #
 # Configures to build the Qtopia Environment
 #
 # Copyright 1999-2000 Trolltech AS.  All rights reserved.
 #
 
-PLATFORM=linux-generic-g++
+PLATFORM=generic
 SHARING=shared
 DEBUG=
 QCONFIGARG=
 
 touch .test.qpe.
 if [ '!' -f ${OPIEDIR}/.test.qpe. ];
@@ -26,18 +26,15 @@ then
     echo
     echo
     exit 1
 fi
 rm .test.qpe.
 
-mkdir -p include/qpe
-( cd include/qpe &&  rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
-
-VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h)
-VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h)
+VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h)
+VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h)
 
 TOMAKE=
 
 if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h
 then
     QT3=yes
@@ -114,12 +111,20 @@ each option:
 
     -platform target ... The platform you are building on ($PLATFORM)
 EOF
    exit 0;
 fi
 
+if [ -f library/custom-$PLATFORM.h ]
+then
+    rm -f library/custom.h
+    ln -s custom-$PLATFORM.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; )
 
 echo Creating makefiles...
 
 sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
 mv library/library.pro-v library/library.pro