]> xenbits.xensource.com Git - libvirt.git/commitdiff
build: Always ship virt-login-shell.conf
authorAndrea Bolognani <abologna@redhat.com>
Wed, 13 Apr 2016 17:24:51 +0000 (19:24 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Mon, 25 Apr 2016 13:40:44 +0000 (15:40 +0200)
No need to special-case this one: we can add it to EXTRA_DIST so
that it will be shipped in any case, and if WITH_LOGIN_SHELL
happens to be enabled we mark it for installation as well.

tools/Makefile.am

index 9302ee8aef4241953fb87c979a8465b1d87d4657..3225335fe91230d7886c145b13c448d8794aeef7 100644 (file)
@@ -62,6 +62,7 @@ EXTRA_DIST = \
        virt-pki-validate.in                            \
        virt-sanlock-cleanup.in                         \
        libvirt-guests.sysconf                          \
+       virt-login-shell.conf                           \
        virsh-edit.c                                    \
        virsh-domain.c                                  \
        virsh-domain-monitor.c                          \
@@ -101,10 +102,7 @@ if WITH_LOGIN_SHELL
 conf_DATA += virt-login-shell.conf
 bin_PROGRAMS += virt-login-shell
 man1_MANS += virt-login-shell.1
-else ! WITH_LOGIN_SHELL
-EXTRA_DIST += \
-               virt-login-shell.conf
-endif ! WITH_LOGIN_SHELL
+endif WITH_LOGIN_SHELL
 
 if WITH_HOST_VALIDATE
 bin_PROGRAMS += virt-host-validate