From f1638a688ac157ef64bcc1ff950538b89ed7aa4a Mon Sep 17 00:00:00 2001
From: "Pawel \"l0ner\" Soltys" <pwslts@gmail.com>
Date: Tue, 7 Feb 2012 18:19:04 +0100
Subject: libkipi:  minor fixups, dropped _prefix variable

---
 arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'arch')

diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
index e66eb1a4a..6ff3593c5 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=trinity-libkipi
 pkgver=3513
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
@@ -15,26 +15,24 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
 md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
 
-_prefix=/opt/trinity
-
 build() {
-
   msg "Setting Trinity Environment variables"
-  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+  [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+  [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
   
   msg "Starting automake..."
   cd "$srcdir/libraries/libkipi"
   cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
   cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  sed -i -e "s@/usr/include/tqt@$TDEDIR/include/tqt@" admin/acinclude.m4.in
   make -f admin/Makefile.common
 
   msg "Starting configure..."
   ./configure --with-qt-dir=${QTDIR} \
-     --prefix=${_prefix} \
-     --enable-closure \
-     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
-     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+     --prefix=${TDEDIR} \
+     --enable-closure
+     #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+     #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig
 
   msg "Building ${pkgname}..."
   make
-- 
cgit v1.2.3