dbus-tqt: minor fixups, dropped prefix, added install file

1 files changed, 21 insertions, 22 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
index a3c090630..fb68f2239 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -14,36 +14,35 @@ makedepends=('pkgconfig' 'cmake')
 options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')
-
-_prefix="/opt/trinity"
+install='trinity-dbus-tqt.install'
 
 build() {
 
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  . /etc/profile.d/qt3.sh
-   . /etc/profile.d/trinity.sh
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   # Source the QT and TDE profile
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh 
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
 
-  #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
-  #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr
-  #export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
-  #export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+   #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
+   #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/include:${TDEDIR}/include/libkrandr
+   #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH
+   #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
 
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Starting cmake..."
-  cmake ${srcdir}/dependencies/dbus-tqt \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON 
+   msg "Starting cmake..."
+   cmake ${srcdir}/dependencies/dbus-tqt \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR 
 
-  msg "Building - $pkgname..."
-  make
+   msg "Building - $pkgname..."
+   make
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
-  make DESTDIR="${pkgdir}" install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   make DESTDIR="${pkgdir}" install
 }