summaryrefslogtreecommitdiff
path: root/configure
authorsandman <sandman>2002-06-13 15:08:49 (UTC)
committer sandman <sandman>2002-06-13 15:08:49 (UTC)
commit1b5c103ca47a091c37c084133c3b26b8d6e04db5 (patch) (side-by-side diff)
treeccd5db0a47965a1169976074c0b341032f5b82c2 /configure
parentd3cf2ac6fb114cbabc5de481ea275b30f396d2a1 (diff)
downloadopie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.zip
opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.gz
opie-1b5c103ca47a091c37c084133c3b26b8d6e04db5.tar.bz2
Fixed a bug concerning spaces in path/file names
Diffstat (limited to 'configure') (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
@@ -125,111 +125,111 @@ EOF
exit 0;
fi
CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
if [ -f library/custom-$CUSTOM.h ]
then
rm -f library/custom.h
ln -s custom-$CUSTOM.h library/custom.h
fi
mkdir -p include/qpe
( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
mkdir -p include/opie
( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
echo Creating makefiles...
sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v
mv library/library.pro-v library/library.pro
if [ "$QT3" = yes ]
then
VCONFIG="CONFIG+=qt3"
else
VCONFIG="CONFIG+=qt2"
fi
if [ -f $TMAKEPATH/tmake.conf ]
then
# You have tmake. We'll regenerate the file for you...
echo "Makefiles will be regenerated."
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 ]
+ 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 "."
# echo Building $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,,' `
if [ -n "$translation" -a -n "$appname" ]
then
- if [ $appname != $translation ]
+ 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
case $PLATFORM in
*x86*|*generic*|*ipaq*|*sharp*)
SED="$SED /^LIBS.*=/s/\$/ -lutil/;"
PLATFORM_CFLAGS="-DHAVE_OPENPTY"
;; *)
SED=
esac
elif [ "$f" = "libmpeg3" ]
then
# Patch our Makefile.in file with the platform specifics for the libmpeg3 library
# Use the C++ compiler to compile the .c files (because the fixed-point classes are C++ code)
SED='s/\$(CC)/\$(CXX)/;'
case $PLATFORM
in
# For x86 turn on using floating point, compile mmx and css code
*x86*)
# "-funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486"
PLATFORM_CFLAGS="-DHAVE_MMX -DHAVE_CSS"
SED="$SED /SOURCES.*=/s/=/= video\\/mmxidct.S video\\/reconmmx.s\ /;"
# For generic turn on using floating point
;; *generic*)
PLATFORM_CFLAGS=""
# For the ipaq use fixed point maths, don't compile the mmx or css code
;; *ipaq*|*sharp*)
PLATFORM_CFLAGS="-DUSE_FIXED_POINT"
;; *)
# For 'other platforms', turn off optimizations and use fixed point