summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-13 15:08:49 (UTC)
committer sandman <sandman>2002-06-13 15:08:49 (UTC)
commit1b5c103ca47a091c37c084133c3b26b8d6e04db5 (patch) (unidiff)
treeccd5db0a47965a1169976074c0b341032f5b82c2
parentd3cf2ac6fb114cbabc5de481ea275b30f396d2a1 (diff)
downloadopie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.zip
opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.gz
opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.bz2
Fixed a bug concerning spaces in path/file names
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 299e867..cfc4c39 100755
--- a/configure
+++ b/configure
@@ -149,63 +149,63 @@ if [ "$QT3" = yes ]
149then 149then
150 VCONFIG="CONFIG+=qt3" 150 VCONFIG="CONFIG+=qt3"
151else 151else
152 VCONFIG="CONFIG+=qt2" 152 VCONFIG="CONFIG+=qt2"
153fi 153fi
154 154
155if [ -f $TMAKEPATH/tmake.conf ] 155if [ -f $TMAKEPATH/tmake.conf ]
156then 156then
157 # You have tmake. We'll regenerate the file for you... 157 # You have tmake. We'll regenerate the file for you...
158 echo "Makefiles will be regenerated." 158 echo "Makefiles will be regenerated."
159fi 159fi
160 160
161H=`pwd` 161H=`pwd`
162if [ -z "$TOMAKE" ] 162if [ -z "$TOMAKE" ]
163then 163then
164 TOMAKE=`make showcomponents` 164 TOMAKE=`make showcomponents`
165fi 165fi
166 166
167for a in $TOMAKE ; do 167for a in $TOMAKE ; do
168 N=$a/Makefile 168 N=$a/Makefile
169 M=$a/Makefile.in 169 M=$a/Makefile.in
170 O=$a/Makefile.add 170 O=$a/Makefile.add
171 f=`basename $a` 171 f=`basename $a`
172 172
173 if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] 173 if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ]
174 then 174 then
175 ( cd $a; 175 ( cd $a;
176 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 176 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
177 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 177 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
178 -t $H/qt/tmake/propagate.t $f.pro | 178 -t $H/qt/tmake/propagate.t $f.pro |
179 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 179 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
180 ) 180 )
181 echo -n "." 181 echo -n "."
182 #echo Building $N.. 182 #echo Building $N..
183 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 183 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'`
184 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 184 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
185 if [ -n "$translation" -a -n "$appname" ] 185 if [ -n "$translation" -a -n "$appname" ]
186 then 186 then
187 if [ $appname != $translation ] 187 if [ "$appname" != "$translation" ]
188 then 188 then
189 echo 189 echo
190 echo "Warning: translation and appname disagree in $a/$f.pro" 190 echo "Warning: translation and appname disagree in $a/$f.pro"
191 fi 191 fi
192 fi 192 fi
193 193
194 fi 194 fi
195 195
196 cat > $N <<EOF 196 cat > $N <<EOF
197############################################################################# 197#############################################################################
198# Automatically generated from $M 198# Automatically generated from $M
199# Build options from $1 199# Build options from $1
200############################################################################# 200#############################################################################
201 201
202EOF 202EOF
203 203
204 SED= 204 SED=
205 PLATFORM_CFLAGS= 205 PLATFORM_CFLAGS=
206 206
207 if [ "$f" = "embeddedkonsole" ] 207 if [ "$f" = "embeddedkonsole" ]
208 then 208 then
209 case $PLATFORM in 209 case $PLATFORM in
210 *x86*|*generic*|*ipaq*|*sharp*) 210 *x86*|*generic*|*ipaq*|*sharp*)
211 SED="$SED /^LIBS.*=/s/\$/ -lutil/;" 211 SED="$SED /^LIBS.*=/s/\$/ -lutil/;"