[arch-commits] Commit in systemd/trunk (PKGBUILD)

[Dave Reisner]

    Date: Sunday, September 6, 2015 @ 20:20:23
  Author: dreisner
Revision: 245381

use $pkgbase instead of $pkgname when we really want 'systemd'

$pkgname can vary with --pkg, whereas $pkgbase will not.

Fixes FS#46213.

Modified:
  systemd/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-06 18:01:40 UTC (rev 245380)
+++ PKGBUILD	2015-09-06 18:20:23 UTC (rev 245381)
@@ -28,13 +28,13 @@
          '1e2f9a8b0fa32022bf0a8f39123e5f4e')
 
 prepare() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   ./autogen.sh
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   local timeservers=({0..3}.arch.pool.ntp.org)
 
@@ -91,7 +91,7 @@
           etc/udev/udev.conf)
   install="systemd.install"
 
-  make -C "$pkgname" DESTDIR="$pkgdir" install
+  make -C "$pkgbase" DESTDIR="$pkgdir" install
 
   # don't write units to /etc by default. some of these will be re-enabled on
   # post_install.
@@ -101,7 +101,7 @@
   rm -r "$pkgdir/usr/lib/rpm"
 
   # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgname/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+  install -m644 "$pkgbase/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
 
   # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
   sed -i 's#GROUP="dialout"#GROUP="uucp"#g;