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

[Eric Bélanger]

    Date: Tuesday, April 9, 2013 @ 23:35:39
  Author: eric
Revision: 87992

Add build fix for qt3 in /usr

Modified:
  madman/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-09 21:31:23 UTC (rev 87991)
+++ PKGBUILD	2013-04-09 21:35:39 UTC (rev 87992)
@@ -29,7 +29,6 @@
          '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
-  . /etc/profile.d/qt3.sh
   cd $srcdir/$pkgname-$pkgver.orig
 
   patch -p1 -i $srcdir/madman_0.94beta1.20060611-2.diff
@@ -42,12 +41,18 @@
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
   sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
-  cp $srcdir/fake-g++.sh ./g++
+  install -m755 $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons
-  scons install_to=$pkgdir/usr prefix=/usr install
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver.orig
+
+  scons qt_directory=/usr/lib/qt3 add_c_include_dirs=/usr/include/qt3 \
+    install_to=$pkgdir/usr prefix=/usr install
+
   install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
   install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
   install -Dm644 $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large/madman_logo_large.png