summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 18:13:35 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 18:13:35 +0100
commit087f118e8ba039a7054b2a4d451791fcfc527bbf (patch)
treec40c6e6fa19ec727fa79dc8f1b349f22bf42ebd1
parent660df8002d800ae3ed661dfbc825259f0ddeeefa (diff)
downloadtde-packaging-087f118e8ba039a7054b2a4d451791fcfc527bbf.tar.gz
tde-packaging-087f118e8ba039a7054b2a4d451791fcfc527bbf.zip
kdeaddons: minor fixups, dropped _prefix variable
-rw-r--r--arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD17
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
index abe0836fa..8ceafefde 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
@@ -19,30 +19,25 @@ options=('libtool' '!strip')
source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
-_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 < kdeaddons.patch
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
msg "Starting automake..."
cd "$srcdir/kdeaddons"
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} \
+ --prefix=${TDEDIR} \
--enable-closure \
--with-{sdl,xmms} \
- --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
- --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+ #--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