cmake part is now in build section

2 files changed, 14 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 044052ee7219..0c47be47a322 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pcl
 	pkgdesc = A comprehensive open source library for n-D Point Clouds and 3D geometry processing
 	pkgver = 1.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.pointclouds.org
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index f25f381985be..f1799f05e49a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=pcl
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A comprehensive open source library for n-D Point Clouds and 3D geometry processing"
 arch=('x86_64' 'i686')
 url='http://www.pointclouds.org'
@@ -32,22 +32,27 @@ prepare() {
     | xargs sed -i "s/#include <boost.*posix_time.hpp>/#ifndef Q_MOC_RUN\n\r#include <boost\\/date_time\\/posix_time\\/posix_time.hpp>\n\r#endif/g"
 
   # [[ -d build ]] && rm -r build
-  mkdir -p build && cd build
+}
+
+build() {
+# [[ -d build ]] && rm -r build
+#  mkdir -p build && cd build
+ # Create build directory
+  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+  cd ${srcdir}/build
 
-  cmake .. \
+  cmake ${srcdir}/pcl-pcl-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCUDA_HOST_COMPILER=/usr/bin/gcc
-}
 
-build() {
-  cd "${srcdir}/pcl-pcl-${pkgver}/build"
+#  cd "${srcdir}/pcl-pcl-${pkgver}/build"
   make
 }
 
 package() {
-  cd "${srcdir}/pcl-pcl-${pkgver}/build"
+  cd "${srcdir}/build"
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ../LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 ${srcdir}/pcl-pcl-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }