From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 14 Dec 2012 10:54:16 +0000 (+0100)
Subject: build: Install both qemu-lockd.conf and qemu-sanlock.conf
X-Git-Tag: v1.0.1-rc2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e59e1207ae5706351841a46b090ee9a357fff46;p=thirdparty%2Flibvirt.git

build: Install both qemu-lockd.conf and qemu-sanlock.conf

With sanlock enabled, only one of those files was installed.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 25b6e3f631..cb9eb62076 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
+nodist_conf_DATA =
 
 THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
 
@@ -1581,7 +1582,7 @@ if WITH_DTRACE_PROBES
 lockd_la_LIBADD += libvirt_probes.lo
 endif
 if WITH_QEMU
-nodist_conf_DATA = locking/qemu-lockd.conf
+nodist_conf_DATA += locking/qemu-lockd.conf
 BUILT_SOURCES += locking/qemu-lockd.conf
 DISTCLEANFILES += locking/qemu-lockd.conf
 endif
@@ -1732,7 +1733,7 @@ locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
 	cp $< $@
 
 if WITH_QEMU
-nodist_conf_DATA = locking/qemu-sanlock.conf
+nodist_conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
 DISTCLEANFILES += locking/qemu-sanlock.conf
 endif