|
diff --git a/configure b/configure index a9d229e..8b0f37e 100755 --- a/ configure+++ b/ configure |
|
@@ -90,16 +90,17 @@ done |
90 | |
90 | |
91 | TARGET=configs/$PLATFORM-$SHARING$DEBUG |
91 | TARGET=configs/$PLATFORM-$SHARING$DEBUG |
92 | |
92 | |
93 | if [ '!' -f $TARGET ] |
93 | if [ '!' -f $TARGET ] |
94 | then |
94 | then |
95 | if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] |
95 | if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] |
96 | then |
96 | then |
97 | TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG |
97 | TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG |
| |
98 | PLATFORM=linux-$PLATFORM-g++ |
98 | else |
99 | else |
99 | echo |
100 | echo |
100 | echo ' The specified platform/compiler not supported: ' $TARGET |
101 | echo ' The specified platform/compiler not supported: ' $TARGET |
101 | echo |
102 | echo |
102 | exit 2 |
103 | exit 2 |
103 | fi |
104 | fi |
104 | fi |
105 | fi |
105 | |
106 | |
@@ -134,17 +135,16 @@ then |
134 | fi |
135 | fi |
135 | |
136 | |
136 | mkdir -p include/qpe |
137 | mkdir -p include/qpe |
137 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
138 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
138 | |
139 | |
139 | mkdir -p include/opie |
140 | mkdir -p include/opie |
140 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
141 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
141 | |
142 | |
142 | |
| |
143 | echo Creating makefiles... |
143 | echo Creating makefiles... |
144 | |
144 | |
145 | # Set version for library directly |
145 | # Set version for library directly |
146 | # Version 1.5.0 right now for compat. |
146 | # Version 1.5.0 right now for compat. |
147 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
147 | sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
148 | mv library/library.pro-v library/library.pro |
148 | mv library/library.pro-v library/library.pro |
149 | |
149 | |
150 | if [ "$QT3" = yes ] |
150 | if [ "$QT3" = yes ] |
@@ -177,17 +177,17 @@ for a in $TOMAKE ; do |
177 | ( cd $a; |
177 | ( cd $a; |
178 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
178 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
179 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
179 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
180 | -t $H/qt/tmake/propagate.t $f.pro | |
180 | -t $H/qt/tmake/propagate.t $f.pro | |
181 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
181 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
182 | ) |
182 | ) |
183 | echo -n "." |
183 | echo -n "." |
184 | #echo Building $N.. |
184 | #echo Building $N.. |
185 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
185 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"` |
186 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
186 | translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
187 | if [ -n "$translation" -a -n "$appname" ] |
187 | if [ -n "$translation" -a -n "$appname" ] |
188 | then |
188 | then |
189 | if [ "$appname" != "$translation" ] |
189 | if [ "$appname" != "$translation" ] |
190 | then |
190 | then |
191 | echo |
191 | echo |
192 | echo "Warning: translation and appname disagree in $a/$f.pro" |
192 | echo "Warning: translation and appname disagree in $a/$f.pro" |
193 | fi |
193 | fi |
|