1 files changed, 24 insertions, 30 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
index e181b8928..7b64c3544 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
@@ -16,40 +16,34 @@ options=('libtool' '!strip')
 source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
 md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
 
-_prefix="/opt/trinity"
-
 build() {
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+   [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
+   #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+   #export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/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
+
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p build
+   cd build
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/dependencies/dbus-1-tqt \
+      -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+      -DCMAKE_VERBOSE_MAKEFILE=ON 
+
+   msg "Building - $pkgname..."
+   make
 
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  . /etc/profile.d/qt3.sh
-  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
-  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt: \
-     /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
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/dependencies/dbus-1-tqt \
-    -DCMAKE_INSTALL_PREFIX=${_prefix} \
-    -DCMAKE_VERBOSE_MAKEFILE=ON 
-
-  msg "Building - $pkgname..."
-  make
-#     -DWITH_QT3=ON \
-#     -DQTDIR=/opt/qt \
-#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
+   msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-  make DESTDIR="${pkgdir}" install
+   cd ${srcdir}/build
+   make DESTDIR="${pkgdir}" install
 }