Refactor:

* Unify _pyver
* Allow MAKEFLAGS expansion in ninja call.

1 files changed, 8 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 50f61d31f0ec..727cc24b6bfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -53,23 +53,25 @@ prepare() {
 }
 
 build() {
-  _pyver=$(python -c "from sys import version_info; print(\"%d%d\" % (version_info[0],version_info[1]))")
+  _pyver=$(python -c "from sys import version_info; print(\"%d%d\" % (version_info.major,version_info.minor))")
   CMAKE_FLAGS+=("-DPYTHON_V=${_pyver}")
   cmake "${CMAKE_FLAGS[@]}" -S "${srcdir}"/${_name} -B build -G Ninja
 # shellcheck disable=SC2046
-  ninja ${MAKEFLAGS:--j1} -C "build"
+  ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build"
 }
 
 package() {
+  cd "${srcdir}"/build
+
   install -d -m755 "${pkgdir}"/usr/{bin,include,lib}
-  install -m755 build/bin/* "${pkgdir}"/usr/bin
-  install -m644 build/lib/* "${pkgdir}"/usr/lib
-  cp -a "${_name}"/include "${pkgdir}"/usr
+  install -m755 bin/* "${pkgdir}"/usr/bin
+  install -m644 lib/* "${pkgdir}"/usr/lib
+  cp -a "${srcdir}"/${_name}/include "${pkgdir}"/usr
   for file in "${pkgdir}"/usr/include/*/*.in; do mv "$file" "${file%.in}"; done
 
   # install pyluxcore to the Python search path
   #  _pypath=`pacman -Ql python | sed -n '/\/usr\/lib\/python[^\/]*\/$/p' | cut -d" " -f 2`
-  _pypath=$(python -c 'import sys;print("/usr/lib/python{}.{}".format(sys.version_info.major,sys.version_info.minor))')
+  _pypath=$(python -c 'from sys import version_info;print("/usr/lib/python{}.{}".format(version_info.major,version_info.minor))')
   install -d -m755 "${pkgdir}/${_pypath}"
   mv "${pkgdir}"/usr/lib/pyluxcore.so "${pkgdir}/${_pypath}"
 }