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

[Jan Steffens]

    Date: Wednesday, March 7, 2018 @ 23:46:13
  Author: heftig
Revision: 318014

Avoid installing twice

Modified:
  systemd/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-07 23:46:07 UTC (rev 318013)
+++ PKGBUILD	2018-03-07 23:46:13 UTC (rev 318014)
@@ -193,7 +193,8 @@
   rmdir "$pkgdir"/var/log/journal/remote
 
   # runtime libraries shipped with libsystemd
-  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+  install -dm755 libsystemd
+  mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* libsystemd
 
   # manpages shipped with systemd-sysvcompat
   rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
@@ -244,12 +245,8 @@
   license=('GPL2')
   provides=('libsystemd.so' 'libudev.so')
 
-  # meson does not support installing subsets of files, no?
-  # So do a full install to temporary directory, then install what we need.
-  DESTDIR="$srcdir"/full-install ninja -C build install
-
-  install -dm755 "$pkgdir"/usr/lib/
-  cp --archive full-install/usr/lib/lib{nss_*,systemd,udev}.so* "$pkgdir"/usr/lib/
+  install -dm755 "$pkgdir"/usr
+  mv libsystemd "$pkgdir"/usr/lib
 }
 
 package_systemd-sysvcompat() {