[master] 1d62b6685 Revert "Revert "Revert "Only build manual pages in maintainer mode"""

Nils Goroll nils.goroll at uplex.de
Thu Jun 18 12:34:09 UTC 2020


commit 1d62b6685727029c23cd665a395185709f62f7f8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Jun 18 14:32:24 2020 +0200

    Revert "Revert "Revert "Only build manual pages in maintainer mode"""
    
    This reverts commit 970c59edac07ccdb68c1ae13d94516ab8ea8fdfa.
    
    this has been discussed on irc.
    
    I agree that not rebuilding man pages when they are already there makes
    sense.
    
    But not building man pages when we could, does not make any sense to me.
    And enforcing maintainer mode to build from git does not seem to make
    any sense to me either.

diff --git a/configure.ac b/configure.ac
index ac1a3bdcf..cbdeb59cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,6 @@ CC="$PTHREAD_CC"
 
 AC_PROG_INSTALL
 
-AM_COND_IF([MAINTAINER_MODE], [dnl
 AC_ARG_WITH([rst2man],
   AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
   [RST2MAN="$withval"],
@@ -48,7 +47,6 @@ if test "x$RST2MAN" = "xno"; then
   AC_MSG_ERROR(
     [rst2man is needed to build Varnish, please install python3-docutils.])
 fi
-])dnl AM_COND_IF MAINTAINER_MODE
 
 AC_ARG_WITH([sphinx-build],
   AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
diff --git a/man/Makefile.am b/man/Makefile.am
index dd4b7771c..f04a0647c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -24,9 +24,8 @@ dist_man_MANS = \
 	vmod_unix.3 \
 	vmod_proxy.3
 
-MAINTAINERCLEANFILES = $(dist_man_MANS)
+CLEANFILES = $(dist_man_MANS)
 
-if MAINTAINER_MODE
 RST2ANY_FLAGS = --halt=2
 
 BUILD_MAN = $(AM_V_GEN) $(RST2MAN) $(RST2ANY_FLAGS)
@@ -121,4 +120,3 @@ vmod_proxy.3: $(top_builddir)/lib/libvmod_proxy/vmod_proxy.man.rst
 	$(BUILD_MAN) $? $@
 
 .NOPATH: $(dist_man_MANS)
-endif # MAINTAINER_MODE


More information about the varnish-commit mailing list