diff options
| author | Pawel "l0ner" Soltys <[email protected]> | 2012-02-07 18:14:48 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <[email protected]> | 2012-02-07 18:14:48 +0100 |
| commit | c0be9a88ba118323a2720f1e9982f88fb6602e23 (patch) | |
| tree | 55885dbba5055ccded0924e74575d2e9b3065979 /arch/3.5.13/trinity-extras | |
| parent | 4cf9e0b4711496b2f3bb775d262c13437e75a46d (diff) | |
| download | tde-packaging-c0be9a88ba118323a2720f1e9982f88fb6602e23.tar.gz tde-packaging-c0be9a88ba118323a2720f1e9982f88fb6602e23.zip | |
kdeedu: minor fixups, dropped _prefix variable
Diffstat (limited to 'arch/3.5.13/trinity-extras')
| -rw-r--r-- | arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD index 9cb3418d7..e50e88bab 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD @@ -3,7 +3,7 @@ pkgname=trinity-kdeedu pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -15,29 +15,25 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz) md5sums=('37a14a67c4d00babc3015c6a31698cb0') -_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 - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeedu.patch + [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh + [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh msg "Starting automake..." cd "$srcdir/kdeedu" 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 |