01/05: gnu: libvirt: Use /etc as the sysconfdir.

[???]

iyzsong pushed a commit to branch master
in repository guix.

commit a4b9392151cde04a0145df79ecad2eb4e5e7c517
Author: 宋文武 <address@hidden>
Date:   Sun Jun 25 20:56:42 2017 +0800

    gnu: libvirt: Use /etc as the sysconfdir.
    
    * gnu/packages/qemu.scm (libvirt)[arguments]: Add '--sysconfdir=/etc' to
    configure flags.  Replace the 'do-not-mkdir-in-/var' phase with a modified
    'install' phase.
---
 gnu/packages/qemu.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 6838550..8e04f20 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -289,6 +289,7 @@ all common programming languages.  Vala bindings are also 
provided.")
        #:tests? #f
        #:configure-flags
        (list "--with-polkit"
+             "--sysconfdir=/etc"
              "--localstatedir=/var")
        #:phases
        (modify-phases %standard-phases
@@ -299,16 +300,14 @@ all common programming languages.  Vala bindings are also 
provided.")
                             "gnulib/tests/test-posix_spawn2.c")
                (("/bin/sh") (which "sh")))
              #t))
-         (add-after 'unpack 'do-not-mkdir-in-/var
-           ;; Since the localstatedir should be /var at runtime, we must
-           ;; prevent writing to /var at installation time.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out           (assoc-ref outputs "out"))
-                    (localstatedir (string-append out "/var")))
-               (substitute* '("src/Makefile.in"
-                              "daemon/Makefile.in")
-                 (("\\$\\(DESTDIR\\)\\$\\(localstatedir)") localstatedir)))
-             #t)))))
+         (replace 'install
+           ;; Since the sysconfdir and localstatedir should be /etc and /var
+           ;; at runtime, we must prevent writing to them at installation
+           ;; time.
+           (lambda _
+             (zero? (system* "make" "install"
+                             "sysconfdir=/tmp/etc"
+                             "localstatedir=/tmp/var")))))))
     (inputs
      `(("libxml2" ,libxml2)
        ("gnutls" ,gnutls)