summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 18:16:21 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 18:16:21 +0100
commit8d78df1ac9194431625b089d9966051185e8673e (patch)
tree4f895304f26a6af628116579aba19a7bd92c8030
parentc5e4f66b883c6402de44dac4fc057a5d70b4bc28 (diff)
downloadtde-packaging-8d78df1ac9194431625b089d9966051185e8673e.tar.gz
tde-packaging-8d78df1ac9194431625b089d9966051185e8673e.zip
kdesdk: minor fixups, dropped _prefix variable
-rw-r--r--arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD22
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
index ace4fc543..b7cec01c2 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=trinity-kdesdk
pkgver=3513
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
@@ -19,38 +19,33 @@ md5sums=('130662f683be1a49d56a713c5ae87e46'
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
- export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
- export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/kde
- export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde:$LD_LIBRARY_PATH
- export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
-
- _prefix="/opt/trinity"
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
patch -N -d ${srcdir} -p0 < kdesdk.patch
cd $srcdir/kdesdk
msg "Starting configure..."
-
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-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
- --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \
--with-berkeley-db \
--with-subversion
+ #--with-extra-includes=${TDEDIR}/include:/usr/include/dbus-1.0:${TDEDIR}/include/libkrandr \
+ #--with-extra-libs=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${TDEDIR}/pkgconfig \
make
-
#msg "Starting cmake..."
#cmake ${srcdir}/kdesdk \
- # -DCMAKE_INSTALL_PREFIX=${_prefix} \
+ # -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
# -DCMAKE_VERBOSE_MAKEFILE=ON \
# -DWITH_DBSEARCHENGINE=ON \
# -DWITH_KCAL=ON \
@@ -76,6 +71,5 @@ build() {
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/kdesdk
-
make DESTDIR="$pkgdir" install
}