Fix linking and syntax

1 files changed, 29 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 66bb4a1c8039..d4342a028aff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Marc Vidal <mvidaldp@gmail.com>
 
 pkgname=liblsl
-pkgver=v1.14.0
-_pkgver=1.14.0
+pkgver=1.14.0
+_pkgver=v1.14.0
 pkgrel=1
 pkgdesc='C++ lsl library for multi-modal time-synched data transmission over the local network (stable release)'
 arch=('any')
@@ -12,42 +12,45 @@ depends=('gcc-libs')
 makedepends=('git' 'cmake' 'patchelf')
 provides=($pkgname)
 conflicts=("${pkgname}-git")
-source=("${pkgname}-${_pkgver}::git+ssh://git@github.com/sccn/liblsl.git#tag=${pkgver}")
+source=("${pkgname}-${pkgver}::git+ssh://git@github.com/sccn/liblsl.git#tag=${_pkgver}")
 md5sums=('SKIP')
 
 
 build() {
     cmake \
-        -B "${pkgname}-${_pkgver}/build" \
-        -S "${pkgname}-${_pkgver}" \
-        -DLSL_UNIXFOLDERS=ON \
+        -B "${pkgname}-${pkgver}/build" \
+        -S "${pkgname}-${pkgver}" \
         -DCMAKE_BUILD_TYPE:STRING='None' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+        -DLSL_UNIXFOLDERS:BOOL='ON' \
         -Wno-dev
-    make -C "${pkgname}-${_pkgver}/build"
+    make -C "${pkgname}-${pkgver}/build" all
 }
 
 package() {
+    make -C "${pkgname}-${pkgver}/build" DESTDIR="$pkgdir" install
+
     mkdir -p "${pkgdir}/opt/LSL/bin"
-    mkdir -p "${pkgdir}/opt/LSL/include"
+    mkdir -p "${pkgdir}/opt/LSL/include/lsl"
     mkdir -p "${pkgdir}/opt/LSL/lib"
     mkdir -p "${pkgdir}/opt/LSL/share/licenses"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/${pkgname}.so.${_pkgver}" "${pkgdir}/usr/lib/${pkgname}.so.${_pkgver}"
-    ln -rs -T "${pkgdir}/usr/lib/${pkgname}.so.${_pkgver}" "${pkgdir}/usr/lib/${pkgname}.so"
-    ln -rs -T "${pkgdir}/usr/lib/${pkgname}.so" "${pkgdir}/opt/LSL/lib/${pkgname}.so.${_pkgver}"
-    ln -rs -T "${pkgdir}/opt/LSL/lib/${pkgname}.so.${_pkgver}" "${pkgdir}/opt/LSL/lib/${pkgname}.so"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/LSLConfig.cmake" "${pkgdir}/opt/LSL/LSLConfig.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/LSLTargets.cmake" "${pkgdir}/opt/LSL/LSLTargets.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/LSLCMake.cmake" "${pkgdir}/opt/LSL/LSLCMake.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/LSLConfigVersion.cmake" "${pkgdir}/opt/LSL/LSLConfigVersion.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/CPackConfig.cmake" "${pkgdir}/opt/LSL/CPackConfig.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/CPackSourceConfig.cmake" "${pkgdir}/opt/LSL/CPackSourceConfig.cmake"
-    install -Dm 755 "${pkgname}-${_pkgver}/build/lslver" "${pkgdir}/usr/bin/lslver"
-    ln -rs -T "${pkgdir}/usr/bin/lslver" "${pkgdir}/opt/LSL/bin/lslver"
-    install -Dm 755 "${pkgname}-${_pkgver}/include/lsl_c.h" "${pkgdir}/usr/include/lsl_c.h"
-    ln -rs -T "${pkgdir}/usr/include/lsl_c.h" "${pkgdir}/opt/LSL/include/lsl_c.h"
-    install -Dm 755 "${pkgname}-${_pkgver}/include/lsl_cpp.h" "${pkgdir}/usr/include/lsl_cpp.h"
-    ln -rs -T "${pkgdir}/usr/include/lsl_cpp.h" "${pkgdir}/opt/LSL/include/lsl_cpp.h"
-    install -Dm 644 "${pkgname}-${_pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    ln -rs -T "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" "${pkgdir}/opt/LSL/share/licenses/LICENSE"
+
+    ln -rsT "${pkgdir}/usr/bin/lslver" "${pkgdir}/opt/LSL/bin/lslver"
+    ln -rsT "${pkgdir}/usr/include/lsl_c.h" "${pkgdir}/opt/LSL/include/lsl_c.h"
+    ln -rsT "${pkgdir}/usr/include/lsl_cpp.h" "${pkgdir}/opt/LSL/include/lsl_cpp.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/common.h" "${pkgdir}/opt/LSL/include/lsl/common.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/inlet.h" "${pkgdir}/opt/LSL/include/lsl/inlet.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/outlet.h" "${pkgdir}/opt/LSL/include/lsl/outlet.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/resolver.h" "${pkgdir}/opt/LSL/include/lsl/resolver.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/streaminfo.h" "${pkgdir}/opt/LSL/include/lsl/streaminfo.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/types.h" "${pkgdir}/opt/LSL/include/lsl/types.h"
+    ln -rsT "${pkgdir}/usr/include/lsl/xml.h" "${pkgdir}/opt/LSL/include/lsl/xml.h"
+    ln -rsT "${pkgdir}/usr/lib/${pkgname}.so.${pkgver}" "${pkgdir}/opt/LSL/lib/${pkgname}.so.${pkgver}"
+    ln -rsT "${pkgdir}/opt/LSL/lib/${pkgname}.so.${pkgver}" "${pkgdir}/opt/LSL/lib/${pkgname}.so" 
+
+    install -D -m644 "${pkgdir}/usr/share/LSL/LSLCMake.cmake" -t "${pkgdir}/opt/LSL/LSLCMake.cmake"
+    install -D -m644 "${pkgdir}/usr/share/LSL/LSLConfig.cmake" -t "${pkgdir}/opt/LSL/LSLConfig.cmake"
+    install -D -m644 "${pkgdir}/usr/share/LSL/LSLConfigVersion.cmake" -t "${pkgdir}/opt/LSL/LSLConfigVersion.cmake"
+    install -D -m644 "${pkgdir}/usr/share/LSL/LSLTargets-none.cmake" -t "${pkgdir}/opt/LSL/LSLTargets-none.cmake"
+    install -D -m644 "${pkgdir}/usr/share/LSL/LSLTargets.cmake" -t "${pkgdir}/opt/LSL/LSLTargets.cmake"
 }
\ No newline at end of file