kdesdk: minor fixups, dropped _prefix variable

pull/3/head
Pawel "l0ner" Soltys 13 years ago
parent c5e4f66b88
commit 8d78df1ac9

@ -3,7 +3,7 @@
pkgname=trinity-kdesdk pkgname=trinity-kdesdk
pkgver=3513 pkgver=3513
pkgrel=1 pkgrel=2
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org' url='http://www.trinitydesktop.org'
license=('GPL') license=('GPL')
@ -19,38 +19,33 @@ md5sums=('130662f683be1a49d56a713c5ae87e46'
build() { build() {
msg "Setting PATH, CMAKE and Trinity Environment variables" msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/kde [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
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"
patch -N -d ${srcdir} -p0 < kdesdk.patch patch -N -d ${srcdir} -p0 < kdesdk.patch
cd $srcdir/kdesdk cd $srcdir/kdesdk
msg "Starting configure..." msg "Starting configure..."
cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" 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 make -f admin/Makefile.common
msg "Starting configure..." msg "Starting configure..."
./configure --with-qt-dir=${QTDIR} \ ./configure --with-qt-dir=${QTDIR} \
--prefix=${_prefix} \ --prefix=${TDEDIR} \
--enable-closure \ --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-berkeley-db \
--with-subversion --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 make
#msg "Starting cmake..." #msg "Starting cmake..."
#cmake ${srcdir}/kdesdk \ #cmake ${srcdir}/kdesdk \
# -DCMAKE_INSTALL_PREFIX=${_prefix} \ # -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
# -DCMAKE_VERBOSE_MAKEFILE=ON \ # -DCMAKE_VERBOSE_MAKEFILE=ON \
# -DWITH_DBSEARCHENGINE=ON \ # -DWITH_DBSEARCHENGINE=ON \
# -DWITH_KCAL=ON \ # -DWITH_KCAL=ON \
@ -76,6 +71,5 @@ build() {
package() { package() {
msg "Packaging - $pkgname-$pkgver" msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/kdesdk cd ${srcdir}/kdesdk
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
} }

Loading…
Cancel
Save