distro: Rename (distro) to (gnu packages).

[jackhill/guix/guix.git] / daemon.am

diff --git a/daemon.am b/daemon.am
index b2c0e64..e314e4d 100644 (file)
--- a/daemon.am
+++ b/daemon.am
@@ -1,20 +1,20 @@
-# Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
-# Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 #
-# This file is part of Guix.
+# This file is part of GNU Guix.
 #
-# Guix is free software; you can redistribute it and/or modify it
+# GNU Guix is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or (at
 # your option) any later version.
 #
-# Guix is distributed in the hope that it will be useful, but
+# GNU Guix is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Guix.  If not, see <http://www.gnu.org/licenses/>.
+# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 #
 # Integration of the `guix-daemon' code taken from upstream Nix.
@@ -55,14 +55,12 @@ libformat_a_CPPFLAGS =                              \
 libutil_a_SOURCES =                            \
   nix/libutil/archive.cc                       \
   nix/libutil/serialise.cc                     \
-  nix/libutil/immutable.cc                     \
   nix/libutil/util.cc                          \
   nix/libutil/xml-writer.cc                    \
   nix/libutil/hash.cc                          \
   nix/libutil/gcrypt-hash.cc
 
 libutil_headers =                              \
-  nix/libutil/immutable.hh                     \
   nix/libutil/hash.hh                          \
   nix/libutil/serialise.hh                     \
   nix/libutil/xml-writer.hh                    \
@@ -114,7 +112,7 @@ libstore_a_CPPFLAGS =                               \
   -DNIX_CONF_DIR=\"$(sysconfdir)/nix\"         \
   -DNIX_LIBEXEC_DIR=\"$(libexecdir)\"          \
   -DNIX_BIN_DIR=\"$(bindir)\"                  \
-  -DOPENSSL_PATH="\"FIXME--no OpenSSL support\""
+  -DOPENSSL_PATH="\"openssl\""
 
 libstore_a_CFLAGS =                            \
   $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
@@ -136,6 +134,16 @@ guix_daemon_LDADD =                                \
 guix_daemon_headers =                          \
   nix/nix-daemon/shared.hh
 
+libexec_PROGRAMS = nix-setuid-helper
+nix_setuid_helper_SOURCES =                    \
+  nix/nix-setuid-helper/nix-setuid-helper.cc
+
+nix_setuid_helper_CPPFLAGS =                   \
+  $(libutil_a_CPPFLAGS)
+
+nix_setuid_helper_LDADD =                      \
+  libutil.a libformat.a
+
 noinst_HEADERS =                                               \
   $(libformat_headers) $(libutil_headers) $(libstore_headers)  \
   $(guix_daemon_headers)
@@ -165,5 +173,7 @@ TESTS +=                                    \
   tests/guix-daemon.sh
 
 clean-local:
-       -find "$(GUIX_TEST_ROOT)" | xargs chmod +w
+       -if test -d "$(GUIX_TEST_ROOT)"; then           \
+         find "$(GUIX_TEST_ROOT)" | xargs chmod +w;    \
+        fi
        -rm -rf "$(GUIX_TEST_ROOT)"