Use short options to make and install to allow non-gnu versions to work.

2 files changed, 7 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a8692958016..06328f5e714a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = st
 	pkgdesc = A simple virtual terminal emulator for X.
 	pkgver = 0.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://st.suckless.org
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e108bf65e36a..2572d9617d60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=st
 pkgver=0.9
-pkgrel=1
+pkgrel=2
 pkgdesc='A simple virtual terminal emulator for X.'
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
 license=('MIT')
@@ -19,7 +19,6 @@ sha256sums=('f36359799734eae785becb374063f0be833cf22f88b4f169cd251b99324e08e7'
             'f9deea445a5c6203a0e8e699f3c3b55e27275f17fb408562c4dd5d649edeea23'
             '0ebcbba881832adf9c98ce9fe7667c851d3cc3345077cb8ebe32702698665be2')
 _sourcedir=$pkgname-$pkgver
-_makeopts="--directory=$_sourcedir"
 
 prepare() {
   patch --directory="$_sourcedir" --strip=0 < terminfo.patch
@@ -57,17 +56,13 @@ prepare() {
 }
 
 build() {
-  make $_makeopts X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+  make -C "$_sourcedir" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 
 package() {
-  local installopts='--mode 0644 -D --target-directory'
   local shrdir="$pkgdir/usr/share"
-  local licdir="$shrdir/licenses/$pkgname"
-  local docdir="$shrdir/doc/$pkgname"
-  make $_makeopts PREFIX=/usr DESTDIR="$pkgdir" install
-  install $installopts "$licdir" "$_sourcedir/LICENSE"
-  install $installopts "$docdir" "$_sourcedir/README"
-  install $installopts "$docdir" README.terminfo.rst
-  install $installopts "$shrdir/$pkgname" "$_sourcedir/st.info"
+  make -C "$_sourcedir" PREFIX=/usr DESTDIR="$pkgdir" install
+  install -D -m 0644 -t "$shrdir/licenses/$pkgname" "$_sourcedir/LICENSE"
+  install -D -m 0644 -t "$shrdir/doc/$pkgname" "$_sourcedir/README" README.terminfo.rst
+  install -D -m 0644 -t "$shrdir/$pkgname" "$_sourcedir/st.info"
 }