diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 18:16:37 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 18:16:37 +0100 |
| commit | a95ed34055befaff4158b33ea0b240f1627e8290 (patch) | |
| tree | cdc3733758b84942e20c801e3d96a2e535187e72 | |
| parent | 8d78df1ac9194431625b089d9966051185e8673e (diff) | |
| download | tde-packaging-a95ed34055befaff4158b33ea0b240f1627e8290.tar.gz tde-packaging-a95ed34055befaff4158b33ea0b240f1627e8290.zip | |
kdetoys: minor fixups, dropped _prefix variable
| -rw-r--r-- | arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD index 1de2a3b95..bd20aa2e7 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdetoys 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/kdetoys-3.5.13.tar.gz) md5sums=('823dd778c1e9e15972a509f4eee4434d') -_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/kdetoys" 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 |