summaryrefslogtreecommitdiff
path: root/configure
authorkergoth <kergoth>2002-03-19 02:41:55 (UTC)
committer kergoth <kergoth>2002-03-19 02:41:55 (UTC)
commit7a4ff15ff356a484a498249f01354dce549eaec2 (patch) (unidiff)
tree42956816894db05e0ae8f30956545e1b9301a9ef /configure
parent0097a3253cae1c440a9d10c1dec261f10023195b (diff)
downloadopie-7a4ff15ff356a484a498249f01354dce549eaec2.zip
opie-7a4ff15ff356a484a498249f01354dce549eaec2.tar.gz
opie-7a4ff15ff356a484a498249f01354dce549eaec2.tar.bz2
ugh.. configure couldnt handle the translation variables properly in its translation = appname sanity check.
Diffstat (limited to 'configure') (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 1652527..e81bc95 100755
--- a/configure
+++ b/configure
@@ -153,49 +153,49 @@ then
153fi 153fi
154 154
155H=`pwd` 155H=`pwd`
156if [ -z "$TOMAKE" ] 156if [ -z "$TOMAKE" ]
157then 157then
158 TOMAKE=`make showcomponents` 158 TOMAKE=`make showcomponents`
159fi 159fi
160 160
161for a in $TOMAKE ; do 161for a in $TOMAKE ; do
162 N=$a/Makefile 162 N=$a/Makefile
163 M=$a/Makefile.in 163 M=$a/Makefile.in
164 O=$a/Makefile.add 164 O=$a/Makefile.add
165 f=`basename $a` 165 f=`basename $a`
166 166
167 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] 167 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ]
168 then 168 then
169 ( cd $a; 169 ( cd $a;
170 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 170 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
171 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 171 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
172 -t $H/qt/tmake/propagate.t $f.pro | 172 -t $H/qt/tmake/propagate.t $f.pro |
173 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 173 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
174 ) 174 )
175 echo -n "." 175 echo -n "."
176 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 176 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
177 translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 177 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
178 if [ -n "$translation" -a -n "$appname" ] 178 if [ -n "$translation" -a -n "$appname" ]
179 then 179 then
180 if [ $appname != $translation ] 180 if [ $appname != $translation ]
181 then 181 then
182 echo 182 echo
183 echo "Warning: translation and appname disagree in $a/$f.pro" 183 echo "Warning: translation and appname disagree in $a/$f.pro"
184 fi 184 fi
185 fi 185 fi
186 186
187 fi 187 fi
188 188
189 cat > $N <<EOF 189 cat > $N <<EOF
190############################################################################# 190#############################################################################
191# Automatically generated from $M 191# Automatically generated from $M
192# Build options from $1 192# Build options from $1
193############################################################################# 193#############################################################################
194 194
195EOF 195EOF
196 196
197 SED= 197 SED=
198 PLATFORM_CFLAGS= 198 PLATFORM_CFLAGS=
199 199
200 if [ "$f" = "embeddedkonsole" ] 200 if [ "$f" = "embeddedkonsole" ]
201 then 201 then