02/04: gnu: samba: Set localstatedir to /var.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit db29ee0b1b3fafc51a18247a118a10149e8cdb4f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Nov 1 23:57:44 2020 -0500

    gnu: samba: Set localstatedir to /var.
    
    It previously defaulted to a $PREFIX/var, where $PREFIX was the root of the
    installation directory (under /gnu/store) of Samba.
    
    * gnu/packages/samba.scm (samba)[phases]{configure}: Add 
--localstatedir=/var
    option.
    {disable-etc-samba-directory-creation}: Rename to
    disable-etc,var-samba-directories-setup and prevent creating directories 
under
    both sysconfdir and localstatedir.
---
 gnu/packages/samba.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 719ca29..9f1945d 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -221,15 +221,15 @@ external dependencies.")
                        "--bundled-libraries=com_err"
                        (string-append "--prefix=" out)
                        "--sysconfdir=/etc"
+                       "--localstatedir=/var"
                        ;; Install public and private libraries into
                        ;; a single directory to avoid RPATH issues.
                        (string-append "--libdir=" libdir)
                        (string-append "--with-privatelibdir=" libdir)))))
-         (add-before 'install 'disable-etc-samba-directory-creation
+         (add-before 'install 'disable-etc,var-samba-directories-setup
            (lambda _
              (substitute* "dynconfig/wscript"
-               (("bld\\.INSTALL_DIR\\(\"\\$\\{CONFIGDIR\\}\"\\)")
-                ""))
+               (("bld\\.INSTALL_DIR.*") ""))
              #t)))
        ;; XXX: The test infrastructure attempts to set password with
        ;; smbpasswd, which fails with "smbpasswd -L can only be used by root."