From: Eric Blake <eblake@redhat.com>
Date: Sat, 31 Aug 2013 02:16:06 +0000 (-0600)
Subject: build: fix virtlockd file distribution
X-Git-Tag: v1.1.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=902d62f0d46ebc17f13a4a74fc033e952a65577d;p=thirdparty%2Flibvirt.git

build: fix virtlockd file distribution

Since virtlockd is only built when libvirtd is built, we should
not install its auxiliary files unconditionally.  This solves
two failures.  1. 'make distcheck' complains:

rm -f Makefile
ERROR: files left in build directory after distclean:
./src/virtlockd.8

2. './autobuild.sh' complains:

Checking for unpackaged file(s): /usr/lib/rpm/check-files
/home/eblake/rpmbuild/BUILDROOT/mingw-libvirt-1.1.1-1.fc19.eblake1377879911.x86_64
error: Installed (but unpackaged) file(s) found:
   /usr/i686-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf

/usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug
   /usr/i686-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug
   /usr/i686-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8
   /usr/x86_64-w64-mingw32/sys-root/mingw/etc/libvirt/virtlockd.conf

/usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/tests/test_virtlockd.aug
   /usr/x86_64-w64-mingw32/sys-root/mingw/share/augeas/lenses/virtlockd.aug
   /usr/x86_64-w64-mingw32/sys-root/mingw/share/man/man8/virtlockd.8

* src/Makefile.am (CLEANFILES): Add virtlockd.8.
(man8_MANS, conf_DATA, augeas_DATA, augeastest_DATA): Only install
virtlockd files when daemon is built.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index d8b943d9dc..636bcbc3a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2046,14 +2046,16 @@ virtlockd.8: $(srcdir)/virtlockd.8.in
 	    < $< > $@-t && \
 	mv $@-t $@
 
+if WITH_LIBVIRTD
 man8_MANS = virtlockd.8
 
 conf_DATA += locking/virtlockd.conf
 
 augeas_DATA += locking/virtlockd.aug
 augeastest_DATA += test_virtlockd.aug
+endif WITH_LIBVIRTD
 
-CLEANFILES += test_virtlockd.aug
+CLEANFILES += test_virtlockd.aug virtlockd.8
 MAINTAINERCLEANFILES += $(srcdir)/virtlockd.8.in
 
 EXTRA_DIST += \