docs: Only distribute sanlock manpage if WITH_SANLOCK

Message ID bb288f828d3c0fb2b1f99ec23f5ead7db3b19c52.1576698428.git.crobinso@redhat.com
State Accepted
Commit 25729d6c172f9257afcf230abc9d0f5a6ea5d114
Headers show
Series
  • docs: Only distribute sanlock manpage if WITH_SANLOCK
Related show

Commit Message

Cole Robinson Dec. 18, 2019, 7:47 p.m.
This fixes mingw-libvirt RPM build

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 docs/Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Fabiano FidĂȘncio Dec. 18, 2019, 7:51 p.m. | #1
On Wed, Dec 18, 2019 at 8:48 PM Cole Robinson <crobinso@redhat.com> wrote:
>
> This fixes mingw-libvirt RPM build
>
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  docs/Makefile.am | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/docs/Makefile.am b/docs/Makefile.am
> index eb8de80b9c..66f164a1ac 100644
> --- a/docs/Makefile.am
> +++ b/docs/Makefile.am
> @@ -214,9 +214,7 @@ manpages7_rst = \
>    $(KEYCODES:%=manpages/virkeycode-%.rst) \
>    $(KEYNAMES:%=manpages/virkeyname-%.rst) \
>    $(NULL)
> -manpages8_rst = \
> -  manpages/virt-sanlock-cleanup.rst \
> -  $(NULL)
> +manpages8_rst = $(NULL)
>  manpages_rst += \
>    $(manpages1_rst) \
>    $(manpages7_rst) \
> @@ -245,6 +243,11 @@ if WITH_LOGIN_SHELL
>  else ! WITH_LOGIN_SHELL
>    manpages_rst += manpages/virt-login-shell.rst
>  endif ! WITH_LOGIN_SHELL
> +if WITH_SANLOCK
> +  manpages8_rst += manpages/virt-sanlock-cleanup.rst
> +else ! WITH_SANLOCK
> +  manpages_rst += manpages/virt-sanlock-cleanup.rst
> +endif ! WITH_SANLOCK
>  manpages_rst_html_in = \
>    $(manpages_rst:%.rst=%.html.in)
>  manpages_html = \
> --
> 2.23.0
>
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>

Reviewed-by: Fabiano FidĂȘncio <fidencio@redhat.com>


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patch

diff --git a/docs/Makefile.am b/docs/Makefile.am
index eb8de80b9c..66f164a1ac 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -214,9 +214,7 @@  manpages7_rst = \
   $(KEYCODES:%=manpages/virkeycode-%.rst) \
   $(KEYNAMES:%=manpages/virkeyname-%.rst) \
   $(NULL)
-manpages8_rst = \
-  manpages/virt-sanlock-cleanup.rst \
-  $(NULL)
+manpages8_rst = $(NULL)
 manpages_rst += \
   $(manpages1_rst) \
   $(manpages7_rst) \
@@ -245,6 +243,11 @@  if WITH_LOGIN_SHELL
 else ! WITH_LOGIN_SHELL
   manpages_rst += manpages/virt-login-shell.rst
 endif ! WITH_LOGIN_SHELL
+if WITH_SANLOCK
+  manpages8_rst += manpages/virt-sanlock-cleanup.rst
+else ! WITH_SANLOCK
+  manpages_rst += manpages/virt-sanlock-cleanup.rst
+endif ! WITH_SANLOCK
 manpages_rst_html_in = \
   $(manpages_rst:%.rst=%.html.in)
 manpages_html = \