summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-19 02:41:55 (UTC)
committer kergoth <kergoth>2002-03-19 02:41:55 (UTC)
commit7a4ff15ff356a484a498249f01354dce549eaec2 (patch) (side-by-side diff)
tree42956816894db05e0ae8f30956545e1b9301a9ef
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 (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
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 "."
appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
- translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
+ 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" ]
then