1 files changed, 14 insertions, 2 deletions
diff --git a/daemon.am b/daemon.am
index f2cb0a499e..f75eef2e98 100644
--- a/daemon.am
+++ b/daemon.am
@@ -21,7 +21,7 @@
 #
 
 BUILT_SOURCES += nix/libstore/schema.sql.hh
-CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service
+CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
 
 noinst_LIBRARIES = libformat.a libutil.a libstore.a
 
@@ -191,11 +191,23 @@ etc/guix-daemon.service: etc/guix-daemon.service.in	\
 	       "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"
 	mv "$@.tmp" "$@"
 
+# The '.conf' job for Upstart.
+upstartjobdir = $(libdir)/upstart/system
+nodist_upstartjob_DATA = etc/guix-daemon.conf
+
+etc/guix-daemon.conf: etc/guix-daemon.conf.in	\
+			 $(top_builddir)/config.status
+	$(MKDIR_P) "`dirname "$@"`"
+	$(SED) -e 's|@''bindir''@|$(bindir)|' <				\
+	       "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"
+	mv "$@.tmp" "$@"
+
 EXTRA_DIST +=					\
   nix/libstore/schema.sql			\
   nix/AUTHORS					\
   nix/COPYING					\
-  etc/guix-daemon.service.in
+  etc/guix-daemon.service.in	\
+  etc/guix-daemon.conf.in
 
 AM_TESTS_ENVIRONMENT +=				\
   top_builddir="$(abs_top_builddir)"