author | sandman <sandman> | 2002-06-13 15:08:49 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-13 15:08:49 (UTC) |
commit | 1b5c103ca47a091c37c084133c3b26b8d6e04db5 (patch) (unidiff) | |
tree | ccd5db0a47965a1169976074c0b341032f5b82c2 | |
parent | d3cf2ac6fb114cbabc5de481ea275b30f396d2a1 (diff) | |
download | opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.zip opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.gz opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.bz2 |
Fixed a bug concerning spaces in path/file names
-rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -161,39 +161,39 @@ fi | |||
161 | H=`pwd` | 161 | H=`pwd` |
162 | if [ -z "$TOMAKE" ] | 162 | if [ -z "$TOMAKE" ] |
163 | then | 163 | then |
164 | TOMAKE=`make showcomponents` | 164 | TOMAKE=`make showcomponents` |
165 | fi | 165 | fi |
166 | 166 | ||
167 | for a in $TOMAKE ; do | 167 | for 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 |