From 65529e49ff5b9052544271b1b7923feed4312849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Jan 2014 23:45:59 +0100
Subject: [PATCH] build-system/gnu: Pass --localstatedir=/var
 --sharedstatedir=/com.

Suggested by John Darrington <john@darrington.wattle.id.au>
and Mark H Weaver <mhw@netris.org>.

* guix/build/gnu-build-system.scm (configure): Pass --localstatedir=/var
  --sharedstatedir=/com.
* gnu/packages/admin.scm (dmd): Remove 'arguments' field.
* gnu/packages/avahi.scm (avahi): Remove --localstatedir flag.
* gnu/packages/glib.scm (dbus): Likewise.
* gnu/packages/package-management.scm (guix): Likewise.
* gnu/packages/pulseaudio.scm (pulseaudio): Likewise.
---
 gnu/packages/admin.scm              | 2 --
 gnu/packages/avahi.scm              | 3 +--
 gnu/packages/glib.scm               | 5 +----
 gnu/packages/package-management.scm | 3 +--
 gnu/packages/pulseaudio.scm         | 2 +-
 guix/build/gnu-build-system.scm     | 8 +++++++-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index dfbf20d56f..9520cab2d5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -51,8 +51,6 @@
                "07mddw0p62fcphwjzgb6rfa0pjz5sy6jzbha0sm2vc3rqf459jxg"))
              (patches (list (search-patch "dmd-getpw.patch")))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--localstatedir=/var")))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs `(("guile" ,guile-2.0)))
     (synopsis "Daemon managing daemons")
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm
index bc70878d46..d1023cd4b6 100644
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,7 +44,6 @@
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--with-distro=none"
-                           "--localstatedir=/var" ; for the DBus socket
                            "--disable-python"
                            "--disable-mono"
                            "--disable-doxygen-doc"
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 0560915b24..adaa8aa3aa 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -67,10 +67,7 @@
              (patches (list (search-patch "dbus-localstatedir.patch")))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags (list ;; Install the system bus socket under /var.
-                               "--localstatedir=/var"
-
-                               ;; XXX: Fix the following to allow system-wide
+     '(#:configure-flags (list ;; XXX: Fix the following to allow system-wide
                                ;; config.
                                ;; "--sysconfdir=/etc"
 
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index f94f8fc919..cee372e81c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,7 +43,6 @@
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list
-                          "--localstatedir=/var"
                           (string-append "--with-libgcrypt-prefix="
                                          (assoc-ref %build-inputs
                                                     "libgcrypt")))
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index 8bf48c2a89..859e1d6bca 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -148,7 +148,7 @@ parse JSON formatted strings back into the C representation of JSON objects.")
                              "pulseaudio-volume-test.patch")))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc"
+     `(#:configure-flags '(;;"--sysconfdir=/etc"
                            "--disable-oss-output")
        #:phases (alist-cons-before
                  'check 'pre-check
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 6d26392c8f..ed870ade88 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -142,6 +142,12 @@ makefiles."
                        ,(string-append "CONFIG_SHELL=" bash)
                        ,(string-append "SHELL=" bash)
                        ,(string-append "--prefix=" prefix)
+
+                       ;; Keep modifiable state directories outside of the
+                       ;; store (Autoconf 2.70 will add '--runstatedir'.)
+                       "--localstatedir=/var"
+                       "--sharedstatedir=/com"
+
                        "--enable-fast-install"    ; when using Libtool
 
                        ;; Produce multiple outputs when specific output names