From 7904ef63dec4f1c995734293dddedefe28e5a7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 26 May 2011 14:43:46 +0000
Subject: [PATCH] refs #17

---
 install-64-and-32-bit-linux.sh | 41 ++++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh
index fca1fc0..4e620f1 100755
--- a/install-64-and-32-bit-linux.sh
+++ b/install-64-and-32-bit-linux.sh
@@ -1,23 +1,20 @@
 ./bootstrap.sh && \
-    LDFLAGS="-L/usr/local/trolltech/qt-32bit/lib -L/usr/lib32 -m32" \
-    CXXFLAGS="-m32" ./configure \
-    --with-qt-dir=/usr/local/trolltech/qt-32bit/include \
-    --libdir=/usr/local/lib32 \
-    --build=x86_64 \
-    --host=i386 && \
-    make && \
-    sudo make install && \
-    make clean && \
-    LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-    CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
-    ./configure \
-    --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
-    --prefix=/opt/local/i586-mingw32msvc \
-    --build=x86_64 \
-    --host=i586-mingw32msvc && \
-    make && \
-    sudo make install && \
-    make clean && \
-    ./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
-    make check && \
-    sudo make install
+LDFLAGS="-L/usr/lib32 -m32" CXXFLAGS="-m32" ./configure \
+  --libdir=/usr/local/lib32 \
+  --build=x86_64 \
+  --host=i386 && \
+make && \
+sudo make install && \
+make clean && \
+LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
+  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include" \
+  ./configure \
+  --prefix=/opt/local/i586-mingw32msvc \
+  --build=x86_64 \
+  --host=i586-mingw32msvc && \
+make && \
+sudo make install && \
+make clean && \
+./configure && \
+make check && \
+sudo make install