Fix the install of headers and objects for external MKL

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27b6ce7f4a56..1d54bdadc204 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mkl-dnn
 	pkgdesc = Intel® Math Kernel Library for Deep Neural Networks
 	pkgver = 0.10
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/01org/mkl-dnn
 	arch = x86_64
 	license = APACHE
diff --git a/PKGBUILD b/PKGBUILD
index 9a6913f9a5fe..9da18714564a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mkl-dnn
 pkgver=0.10
-pkgrel=3
+pkgrel=4
 
 epoch=
 pkgdesc="Intel® Math Kernel Library for Deep Neural Networks"
@@ -27,8 +27,8 @@ sha1sums=('SKIP')
 build() {
   cd "${srcdir}/mkl-dnn"
   git checkout v0.10
-  cd scripts && ./prepare_mkl.sh && cd -
-  mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}"/usr .. && make doc mkldnn
+  ([[ ! -d external ]] && (cd scripts && ./prepare_mkl.sh && cd -)) || true
+  mkdir -p build && cd build && cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}"/usr .. && make doc && make -j2 mkldnn
 }
 
 #check() {}
@@ -36,8 +36,8 @@ build() {
 package() {
   cd "${srcdir}/mkl-dnn/build"
   make install
-  mkdir -p /usr/include/mkldnn/include/
-  cp -r external/mkl*/include/* /usr/include/mkldnn/include/
-  mkdir -p /usr/lib/mkldnn/lib/
-  cp -r external/mkl*/lib/* /usr/include/mkldnn/lib/
+  mkdir -p ${pkgdir}/usr/include/mkldnn/include/
+  cp -r ../external/mkl*/include/* ${pkgdir}/usr/include/mkldnn/include/
+  mkdir -p ${pkgdir}/usr/lib/mkldnn/lib/
+  cp -r ../external/mkl*/lib/* ${pkgdir}/usr/lib/mkldnn/lib/
 }