[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] build: fix build --without-lxc



On 09/27/2013 09:24 PM, Eric Blake wrote:
> 'make distcheck' fails from a directory configured --without-lxc:
> 
>   GEN      virt-login-shell.1
> Can't write-open ../../tools/virt-login-shell.1: Permission denied at /usr/bin/pod2man line 69.
> 
> * tools/Makefile.am (EXTRA_DIST): Ship pre-built man page.
> 
> Signed-off-by: Eric Blake <eblake redhat com>
> ---
> 
> Pushing under the build-breaker rule.
> 
>  tools/Makefile.am | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index 0193140..1d9892c 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -84,7 +84,9 @@ dist_man1_MANS = \
>  		virsh.1
>  if WITH_LXC
>  dist_man1_MANS += virt-login-shell.1
> -endif WITH_LXC
> +else ! WITH_LXC
> +EXTRA_DIST += virt-login-shell.1
> +endif ! WITH_LXC
>  if WITH_SANLOCK
>  dist_man8_MANS = virt-sanlock-cleanup.8
>  endif WITH_SANLOCK
> 

Squashing this in.

diff --git i/tools/Makefile.am w/tools/Makefile.am
index 1d9892c..d8c912f 100644
--- i/tools/Makefile.am
+++ w/tools/Makefile.am
@@ -74,7 +74,9 @@ endif WITH_SANLOCK
 if WITH_LXC
 conf_DATA += virt-login-shell.conf
 bin_PROGRAMS += virt-login-shell
-endif WITH_LXC
+else ! WITH_LXC
+EXTRA_DIST += virt-login-shell.conf
+endif ! WITH_LXC


 dist_man1_MANS = \


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]