Support custom makepkg build directories

2 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 482c61bb3ce5..8e7d8140c89e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = ns-usbloader
 	pkgdesc = Awoo Installer/TinFoil/GoldLeaf NSPs (and other files) uploader and RCM tool.
 	pkgver = 4.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/developersu/ns-usbloader
 	arch = any
 	license = GPL3
 	depends = java-runtime
 	optdepends = nx-udev: udev rules to run without root
 	source = https://github.com/developersu/ns-usbloader/releases/download/v4.3/ns-usbloader-4.3.jar
+	source = ns-usbloader
+	source = ns-usbloader.desktop
 	sha256sums = 2926c8183389599ebf2ce4d53a96d05a8c344385114e1e28aedd32d43de406d8
+	sha256sums = d00fc704b669bb00f9e26bd70ea784015921c1f4825a8320b1e8f1f1f70ba6e5
+	sha256sums = a196b468549cd5bc53f83c7f0412ea87928f7e0b7923db39e6d9a308b2930727
 
 pkgname = ns-usbloader
 
diff --git a/PKGBUILD b/PKGBUILD
index 5065ab69d19b..062816c6ce0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Angelo Dalzotto <angelodalzotto97 at gmail dot com>
 pkgname=ns-usbloader
 pkgver=4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Awoo Installer/TinFoil/GoldLeaf NSPs (and other files) uploader and RCM tool."
 arch=('any')
 url="https://github.com/developersu/ns-usbloader"
@@ -12,15 +12,23 @@ depends=(
 optdepends=(
 	'nx-udev: udev rules to run without root'
 )
-source=("https://github.com/developersu/ns-usbloader/releases/download/v$pkgver/$pkgname-$pkgver.jar")
-sha256sums=('2926c8183389599ebf2ce4d53a96d05a8c344385114e1e28aedd32d43de406d8')
+source=(
+	"https://github.com/developersu/ns-usbloader/releases/download/v$pkgver/$pkgname-$pkgver.jar"
+	"$pkgname"
+	"$pkgname.desktop"
+)
+sha256sums=(
+	"2926c8183389599ebf2ce4d53a96d05a8c344385114e1e28aedd32d43de406d8"
+	"d00fc704b669bb00f9e26bd70ea784015921c1f4825a8320b1e8f1f1f70ba6e5"
+	"a196b468549cd5bc53f83c7f0412ea87928f7e0b7923db39e6d9a308b2930727"
+)
 
 package() {
-	install -Dm 644 res/app_icon32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/ns-usbloader.png"
-	install -Dm 644 res/app_icon48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/ns-usbloader.png"
-	install -Dm 644 res/app_icon64x64.png "${pkgdir}/usr/share/icons/hicolor/64x64/apps/ns-usbloader.png"
-	install -Dm 644 res/app_icon128x128.png "${pkgdir}/usr/share/icons/hicolor/128x128/apps/ns-usbloader.png"
-	install -Dm 755 "$pkgname-$pkgver.jar" "${pkgdir}/usr/share/java/ns-usbloader/ns-usbloader.jar"
-	install -Dm 755 ../ns-usbloader "${pkgdir}/usr/bin/ns-usbloader"
-	install -Dm 644 ../ns-usbloader.desktop "${pkgdir}/usr/share/applications/ns-usbloader.desktop"
+	install -Dm 644 res/app_icon32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
+	install -Dm 644 res/app_icon48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
+	install -Dm 644 res/app_icon64x64.png "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${pkgname}.png"
+	install -Dm 644 res/app_icon128x128.png "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
+	install -Dm 755 "$pkgname-$pkgver.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+	install -Dm 755 $pkgname "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm 644 $pkgname.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }