From 6e742c7f18e178bafa25943539d424e62d6f8884 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 13 Apr 2016 19:24:51 +0200 Subject: [PATCH] build: Always ship virt-login-shell.conf 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 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 9302ee8aef..3225335fe9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -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 -- GitLab