summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickaël Thomas2017-07-05 18:26:14 +0200
committerMickaël Thomas2017-07-05 18:29:20 +0200
commita90d34351b935732c804108dd2f18be29ef02003 (patch)
tree087f6d6265be1689c2df09552c8d7712c50645be
parentf72f21f9f9d5ff2327e82853035537da88995227 (diff)
downloadaur-a90d34351b935732c804108dd2f18be29ef02003.tar.gz
Fix broken symbolic links
Thanks to Methril for reporting the issue and suggesting a fix
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b806e0e0e2ec..d1fedcfba58c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Jun 27 17:43:46 UTC 2017
+# Wed Jul 5 16:29:20 UTC 2017
pkgbase = microchip-mplabx-bin
pkgdesc = IDE for Microchip PIC and dsPIC development
pkgver = 3.65
- pkgrel = 1
+ pkgrel = 2
url = http://www.microchip.com/mplabx
install = microchip-mplabx-bin.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index ad221bcc6722..3c2f96137418 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=microchip-mplabx-bin
pkgver=3.65
-pkgrel=1
+pkgrel=2
pkgdesc="IDE for Microchip PIC and dsPIC development"
arch=(i686 x86_64)
url='http://www.microchip.com/mplabx'
@@ -101,18 +101,22 @@ EOF
mv "${pkgdir}"/usr/local/lib/*.so{,.*} "${pkgdir}"/usr/lib/
rm -rf "${pkgdir}/usr/local/"
+ _mplabcomm_pkgdir=("${pkgdir}${_mplabcomm_dir}"/v*)
+ _mplabcomm_version=$(basename "${_mplabcomm_pkgdir}")
+ _mplabcomm_srcdir="${_mplabcomm_dir}/${_mplabcomm_version}"
+
# Symlink executables
ln -sf "${_mplabx_dir}/mplab_ide/bin/mplab_ide" "${pkgdir}/usr/bin/"
ln -sf "${_mplabx_dir}/mplab_ide/bin/mdb.sh" "${pkgdir}/usr/bin/mdb"
ln -sf "${_mplabx_dir}/mplab_ide/bin/prjMakefilesGenerator.sh" "${pkgdir}/usr/bin/prjMakefilesGenerator"
ln -sf "${_mplabx_dir}/mplab_ipe/mplab_ipe" "${pkgdir}/usr/bin/"
- ln -sf "${_mplabcomm_dir}"/v*/lib/mchplinusbdevice "${pkgdir}/etc/.mplab_ide/"
+ ln -sf "${_mplabcomm_srcdir}/lib/mchplinusbdevice" "${pkgdir}/etc/.mplab_ide/"
# Symlink libs from MPLABCOMM
local lib
- for lib in "${pkgdir}${_mplabcomm_dir}"/v*/lib/*.so{,.*}; do
+ for lib in "${_mplabcomm_pkgdir}/lib/"*.so{,.*}; do
local bname=$(basename "$lib")
- ln -sf "${_mplabcomm_dir}"/v*/lib/"${bname}" "${pkgdir}/usr/lib/"
+ ln -sf "${_mplabcomm_srcdir}/lib/${bname}" "${pkgdir}/usr/lib/"
done
# Correctly link .so.* -> .so for all libs