PKGBUILD improvements

3 files changed, 15 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4ba659f5e31..5be3966d873c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = system76-oled
 	depends = dbus
 	depends = libx11
 	depends = libxrandr
-	source = https://github.com/pop-os/system76-oled/archive/0.1.4.tar.gz
+	source = system76-oled-0.1.4.tar.gz::https://github.com/pop-os/system76-oled/archive/0.1.4.tar.gz
 	sha256sums = 14bd774108a91780af1cb85bc15089d28d8bd8c3dbe5c6d2eba1b41791ce1f16
 
 pkgname = system76-oled
diff --git a/.gitignore b/.gitignore
index 0cced017d91a..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-*.tar.xz
-*.tar.gz
-/pkg
-/src
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index c61970c9c320..99ecd36f9553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Corey Hinshaw <corey(at)electrickite(dot)org>
-
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: Corey Hinshaw <corey(at)electrickite(dot)org>
 pkgname=system76-oled
 pkgver=0.1.4
 pkgrel=1
@@ -9,16 +9,16 @@ url="https://github.com/pop-os/system76-oled"
 license=('GPL3')
 depends=('dbus' 'libx11' 'libxrandr')
 makedepends=('rust')
-source=("https://github.com/pop-os/${pkgname}/archive/${pkgver}.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('14bd774108a91780af1cb85bc15089d28d8bd8c3dbe5c6d2eba1b41791ce1f16')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-	make clean prefix=/usr
+	cd "$pkgname-$pkgver"
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR="$pkgdir/" install prefix=/usr
+	cd "$pkgname-$pkgver"
+	make DESTDIR="$pkgdir/" install
 }