From 16ee87263e31dc6520937a0dcefd676f3582d8ee Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 14 Jun 2018 13:43:55 -0700 Subject: ovs-sim: Don't install manpage at all (except from ovs-sim itself). ovs-sim is a funny utility since it only works from a build tree, not from an installed OVS. That means that we shouldn't install its manpage when we run "make install". But we do want to install the manpage when we're inside ovs-sim itself, so that the user can invoke "man ovs-sim" from its nested shell. This commit makes this happen. Suggested-by: Roi Dayan Signed-off-by: Ben Pfaff Acked-by: Roi Dayan --- Documentation/automake.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Documentation/automake.mk') diff --git a/Documentation/automake.mk b/Documentation/automake.mk index 2202df45b..bc728dff3 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -110,7 +110,7 @@ DOC_SOURCE = \ Documentation/internals/contributing/libopenvswitch-abi.rst \ Documentation/internals/contributing/submitting-patches.rst \ Documentation/requirements.txt \ - $(addprefix Documentation/ref/,$(RST_MANPAGES)) + $(addprefix Documentation/ref/,$(RST_MANPAGES) $(RST_MANPAGES_NOINST)) FLAKE8_PYFILES += Documentation/conf.py EXTRA_DIST += $(DOC_SOURCE) @@ -158,8 +158,12 @@ RST_MANPAGES = \ ovs-vlan-test.8.rst \ ovsdb-server.7.rst \ ovsdb.5.rst \ - ovsdb.7.rst \ - ovs-sim.1.rst + ovsdb.7.rst + +# rST formatted manpages that we don't want to install because they +# document stuff that only works with a build tree, not with an +# installed OVS. +RST_MANPAGES_NOINST = ovs-sim.1.rst # The GNU standards say that these variables should control # installation directories for manpages in each section. Automake @@ -202,7 +206,7 @@ INSTALL_DATA_LOCAL += install-man-rst if HAVE_SPHINX install-man-rst: docs-check @$(set_mandirs); \ - for rst in $(RST_MANPAGES); do \ + for rst in $(RST_MANPAGES) $(EXTRA_RST_MANPAGES); do \ $(extract_stem_and_section); \ echo " $(MKDIR_P) '$(DESTDIR)'\"$$mandir\""; \ $(MKDIR_P) '$(DESTDIR)'"$$mandir"; \ -- cgit v1.2.1