From: Eric Blake <eblake@redhat.com>
Date: Wed, 9 Jan 2013 21:36:25 +0000 (-0700)
Subject: maint: distribute libvirtd.service.in
X-Git-Tag: v1.0.2-rc1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc522beb6c3aacb861d1e436f55e59c23faf915;p=thirdparty%2Flibvirt.git

maint: distribute libvirtd.service.in

I did a build --without-libvirtd, then ran 'make dist'.  The
resulting tarball was broken, with a complaint that make did not
know how to create libvirtd.service.in.  I traced it to a use
of EXTRA_DIST inside a conditional.

* daemon/Makefile.am (EXTRA_DIST): Hoist libvirtd.service.in
outside of WITH_LIBVIRTD conditional.
---

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index c59084c3a7..95ff8cf564 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST =						\
 	libvirtd.upstart				\
 	libvirtd.policy.in				\
 	libvirtd.sasl					\
+	libvirtd.service.in				\
 	libvirtd.sysconf				\
 	libvirtd.sysctl					\
 	libvirtd.aug                                    \
@@ -322,7 +323,6 @@ uninstall-init-upstart:
 endif # LIBVIRT_INIT_SCRIPT_UPSTART
 
 
-EXTRA_DIST += libvirtd.service.in
 if LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 SYSTEMD_UNIT_DIR = /lib/systemd/system