summaryrefslogtreecommitdiff
path: root/configure
Unidiff
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 a9d229e..8b0f37e 100755
--- a/configure
+++ b/configure
@@ -86,24 +86,25 @@ while [ -n "$1" ]; do
86 HELP=yes;; 86 HELP=yes;;
87 esac 87 esac
88 shift 88 shift
89done 89done
90 90
91TARGET=configs/$PLATFORM-$SHARING$DEBUG 91TARGET=configs/$PLATFORM-$SHARING$DEBUG
92 92
93if [ '!' -f $TARGET ] 93if [ '!' -f $TARGET ]
94then 94then
95 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ] 95 if [ -f configs/linux-$PLATFORM-g++-$SHARING$DEBUG ]
96 then 96 then
97 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG 97 TARGET=configs/linux-$PLATFORM-g++-$SHARING$DEBUG
98 PLATFORM=linux-$PLATFORM-g++
98 else 99 else
99 echo 100 echo
100 echo ' The specified platform/compiler not supported: ' $TARGET 101 echo ' The specified platform/compiler not supported: ' $TARGET
101 echo 102 echo
102 exit 2 103 exit 2
103 fi 104 fi
104fi 105fi
105 106
106# Next, emit a usage message if something failed. 107# Next, emit a usage message if something failed.
107 108
108if [ "$HELP" = "yes" ]; then 109if [ "$HELP" = "yes" ]; then
109 cat <<EOF 110 cat <<EOF
@@ -130,25 +131,24 @@ CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
130if [ -f library/custom-$CUSTOM.h ] 131if [ -f library/custom-$CUSTOM.h ]
131then 132then
132 rm -f library/custom.h 133 rm -f library/custom.h
133 ln -s custom-$CUSTOM.h library/custom.h 134 ln -s custom-$CUSTOM.h library/custom.h
134fi 135fi
135 136
136mkdir -p include/qpe 137mkdir -p include/qpe
137( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 138( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
138 139
139mkdir -p include/opie 140mkdir -p include/opie
140( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) 141( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
141 142
142
143echo Creating makefiles... 143echo Creating makefiles...
144 144
145# Set version for library directly 145# Set version for library directly
146# Version 1.5.0 right now for compat. 146# Version 1.5.0 right now for compat.
147sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v 147sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
148mv library/library.pro-v library/library.pro 148mv library/library.pro-v library/library.pro
149 149
150if [ "$QT3" = yes ] 150if [ "$QT3" = yes ]
151then 151then
152 VCONFIG="CONFIG+=qt3" 152 VCONFIG="CONFIG+=qt3"
153else 153else
154 VCONFIG="CONFIG+=qt2" 154 VCONFIG="CONFIG+=qt2"
@@ -173,25 +173,25 @@ for a in $TOMAKE ; do
173 f=`basename $a` 173 f=`basename $a`
174 174
175 if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ] 175 if [ -f "$TMAKEPATH/tmake.conf" -a -f "$a/$f.pro" ]
176 then 176 then
177 ( cd $a; 177 ( cd $a;
178 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ 178 TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \
179 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ 179 tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \
180 -t $H/qt/tmake/propagate.t $f.pro | 180 -t $H/qt/tmake/propagate.t $f.pro |
181 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; 181 sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in;
182 ) 182 )
183 echo -n "." 183 echo -n "."
184 #echo Building $N.. 184 #echo Building $N..
185 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` 185 appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | tr -d " \t"`
186 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` 186 translation=`grep '^TRANSLATION.*[^+]=.*' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' `
187 if [ -n "$translation" -a -n "$appname" ] 187 if [ -n "$translation" -a -n "$appname" ]
188 then 188 then
189 if [ "$appname" != "$translation" ] 189 if [ "$appname" != "$translation" ]
190 then 190 then
191 echo 191 echo
192 echo "Warning: translation and appname disagree in $a/$f.pro" 192 echo "Warning: translation and appname disagree in $a/$f.pro"
193 fi 193 fi
194 fi 194 fi
195 195
196 fi 196 fi
197 197