From 837b397fce734bb30015c7eda7061a75981cb3a6 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Tue, 7 Feb 2012 18:18:46 +0100 Subject: [PATCH] libkexiv2: minor fixups, dropped _prefix variable --- .../trinity-extras/trinity-libkexiv2/PKGBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD index 20dd82265..585cc5010 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-libkexiv2 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/libkexiv2-3.5.13.tar.gz) md5sums=('74b160da8ea95f25048757b5fe692f85') -_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/libkexiv2" 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