[arch-commits] Commit in icewm-utils/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, April 9, 2013 @ 23:30:21
  Author: eric
Revision: 87989

Add build fix for qt3 in /usr

Modified:
  icewm-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-09 21:29:43 UTC (rev 87988)
+++ PKGBUILD	2013-04-09 21:30:21 UTC (rev 87989)
@@ -50,9 +50,6 @@
          '5116da930c0063dd8c478dd8e473b08f')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  export PATH=/opt/qt/bin:$PATH
-
   cd $srcdir
   # fix default global path to IceWM
   for file in icewoed-$_woedver/qcentralwidget.cpp \
@@ -71,32 +68,32 @@
   (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff)
 
   cd $srcdir/icemc-$_mcver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icets-$_tsver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icebgset-$_bgsetver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/iceked-$_kedver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icecc-$_ccver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icesndcfg-$_sndcfgver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 
   cd $srcdir/icewoed-$_woedver
-  qmake
-  make
+  qmake-qt3
+  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
 }
 
 package() {