1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- a/configure Mon Aug 18 09:23:53 2003
+++ b/configure Wed Sep 3 13:12:20 2003
@@ -1130,10 +1130,4 @@
done
- # symlink the mkspecs directory
- mkdir -p $outpath/mkspecs
- rm -f $outpath/mkspecs/*
- ln -s $relpath/mkspecs/* $outpath/mkspecs
- rm -f $outpath/mkspecs/default
-
# symlink the linguist/doc directory (to make the assistant happy)
mkdir -p $outpath/tools/linguist
@@ -1196,5 +1190,5 @@
# find a make command
MAKE=
-for mk in gmake make; do
+for mk in make; do
if $WHICH $mk >/dev/null 2>&1; then
MAKE=`$WHICH $mk`
@@ -1422,12 +1416,4 @@
fi
-if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then
- CFG_SM=no
- MODULES=`echo $MODULES | sed -e 's/opengl//'`
- PLATFORMS=`find $relpath/mkspecs/qws | sed "s,$relpath/mkspecs/qws/,,"`
-else
- PLATFORMS=`find $relpath/mkspecs/ -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
-fi
-
##if [ "$OPT_CONCURRENT" = "0" ] && echo $MAKEFLAGS | grep '.* *-j[0-9]* *.*' >/dev/null 2>&1; then
# OPT_CONCURRENT=`echo $MAKEFLAGS | sed "s,.* *-j\([0-9]*\) *.*,\1,"`
@@ -2334,6 +2320,5 @@
fi
-# build qmake
-if true; then ###[ '!' -f "$outpath/bin/tqmake" ];
+if false; then
echo "Creating qmake. Please wait..."
rm -f mkspecs/default
@@ -2713,6 +2698,5 @@
if [ '!' -z "$I_FLAGS" ]; then
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=$I_FLAGS\""
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=$I_FLAGS\""
+ QMAKE_VARS="$QMAKE_VARS \"INCPATH+=`echo $I_FLAGS | sed s,-I,,g`\""
fi
|
