mlmmj 1.3.0-8

* Let's not hardcode the package name: mlmmj → $pkgname

2 files changed, 11 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab74a193099a..332d4cdd7b22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mlmmj
 	pkgdesc = Simple and slim mailing list manager (MLM) inspired by ezmlm
 	pkgver = 1.3.0
-	pkgrel = 7
+	pkgrel = 8
 	url = http://mlmmj.org/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 4162cf8e4569..17133e772add 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Klaus Alexander Seistrup <klaus@seistrup.dk>
 # Contributor: Marvin Gülker <quintus at quintilianus point eu>
 # Contributor: Pierre Chapuis <catwell at archlinux dot us>
+# -*- mode: sh -*-
 
 pkgname='mlmmj'
 pkgver=1.3.0
-pkgrel=7
+pkgrel=8
 pkgdesc='Simple and slim mailing list manager (MLM) inspired by ezmlm'
 depends=('smtp-server')
 arch=('i686' 'x86_64' 'armv7h')
@@ -55,31 +56,35 @@ b2sums=(
 
 prepare() {
   cd "$pkgname-$pkgver" || exit 1
+
   patch -Np1 -i "$srcdir/$pkgname-$pkgver.diff"
   patch -Np1 -i "$srcdir/$pkgname-$pkgver-bash.diff"
 }
 
 build() {
   cd "$pkgname-$pkgver" || exit 1
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$pkgname-$pkgver" || exit 1
+
   make DESTDIR="$pkgdir" install
 
   for fname in AUTHORS COPYING LICENSE; do
-    install -Dm0644 "$fname" "$pkgdir/usr/share/licenses/mlmmj/$fname"
+    install -Dm0644 "$fname" "$pkgdir/usr/share/licenses/$pkgname/$fname"
   done
 
   for fname in ChangeLog FAQ README README.* TODO TUNABLES UPGRADE; do
-    install -Dm0644 "$fname" "$pkgdir/usr/share/doc/mlmmj/$fname"
+    install -Dm0644 "$fname" "$pkgdir/usr/share/doc/$pkgname/$fname"
   done
 
   cd "$srcdir" || exit 1
-  install -Dm0644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/mlmmj.conf"
-  install -Dm0644 tmpfile.conf "$pkgdir/usr/lib/tmpfiles.d/mlmmj.conf"
+
+  install -Dm0644 sysuser.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -Dm0644 tmpfile.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
 
 # eof