]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: only create virt-login-shell for lxc builds
authorEric Blake <eblake@redhat.com>
Fri, 30 Aug 2013 19:58:59 +0000 (13:58 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 30 Aug 2013 20:00:56 +0000 (14:00 -0600)
I noticed from an ./autobuild.sh run that we were installing a
virt-login-shell.exe binary when cross-building for mingw,
even though such a binary is necessarily worthless since the
code depends on lxc which is a Linux-only concept.

* tools/Makefile.am (conf_DATA, bin_PROGRAMS, dist_man1_MANS):
Make virt-login-shell installation conditional.

Signed-off-by: Eric Blake <eblake@redhat.com>
tools/Makefile.am

index 74fae2dc017990b92aae76a9befdb37d965ffaee..4a3338fd3d6a6e760f687dbf6620418da17e382f 100644 (file)
@@ -60,10 +60,10 @@ EXTRA_DIST = \
 DISTCLEANFILES =
 
 confdir = $(sysconfdir)/libvirt
-conf_DATA = virt-login-shell.conf
+conf_DATA =
 
 bin_SCRIPTS = virt-xml-validate virt-pki-validate
-bin_PROGRAMS = virsh virt-host-validate virt-login-shell
+bin_PROGRAMS = virsh virt-host-validate
 libexec_SCRIPTS = libvirt-guests.sh
 
 if WITH_SANLOCK
@@ -71,12 +71,20 @@ sbin_SCRIPTS = virt-sanlock-cleanup
 DISTCLEANFILES += virt-sanlock-cleanup
 endif
 
+if WITH_LXC
+conf_DATA += virt-login-shell.conf
+bin_PROGRAMS += virt-login-shell
+endif WITH_LXC
+
+
 dist_man1_MANS = \
                virt-host-validate.1 \
                virt-pki-validate.1 \
                virt-xml-validate.1 \
-               virt-login-shell.1 \
                virsh.1
+if WITH_LXC
+dist_man1_MANS += virt-login-shell.1
+endif WITH_LXC
 if WITH_SANLOCK
 dist_man8_MANS = virt-sanlock-cleanup.8
 endif