Merge pull request #4561 from elliefm/v39/retire-custom-manpage-gener…

…ator retire custom manpage generator
cyrusimap · Aug 11, 2023 · de94b64 · de94b64
2 parents fdfff5e + d6b2c08
commit de94b64
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 211 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1985,7 +1985,7 @@ clean-docsrc:
 
 ## XXX doesn't detect if other rst sources are updated...
 man/.sphinx-build.stamp: docsrc/.sphinx-build.stamp
-	$(AM_V_GEN)DOCSRC=$(top_builddir)/docsrc $(SPHINX_BUILD) $(SPHINX_OPTS) -b cyrman $(top_builddir)/docsrc $(top_builddir)/man
+	$(AM_V_GEN)DOCSRC=$(top_builddir)/docsrc $(SPHINX_BUILD) $(SPHINX_OPTS) -b man $(top_builddir)/docsrc $(top_builddir)/man
 	@touch $@
 
 clean-man:

diff --git a/docsrc/Makefile b/docsrc/Makefile
@@ -143,7 +143,7 @@ text: init
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
 man: init
-	$(SPHINXBUILD) -b cyrman $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
 

diff --git a/docsrc/conf.py b/docsrc/conf.py
@@ -47,7 +47,6 @@
     'sphinx.ext.intersphinx',
 ]
 
-extensions.append('sphinxlocal.builders.manpage')
 extensions.append('sphinxlocal.roles.cyrusman')
 extensions.append('sphinxlocal.builders.gitstamp')
 

diff --git a/docsrc/exts/sphinxlocal/builders/manpage.py b/docsrc/exts/sphinxlocal/builders/manpage.py
diff --git a/docsrc/exts/sphinxlocal/writers/__init__.py b/docsrc/exts/sphinxlocal/writers/__init__.py
diff --git a/docsrc/exts/sphinxlocal/writers/manpage.py b/docsrc/exts/sphinxlocal/writers/manpage.py
diff --git a/docsrc/make.bat b/docsrc/make.bat
@@ -176,7 +176,7 @@ if "%1" == "text" (
 )
 
 if "%1" == "man" (
-	%SPHINXBUILD% -b cyrman %ALLSPHINXOPTS% %BUILDDIR%/man
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
 	if errorlevel 1 exit /b 1
 	echo.
 	echo.Build finished. The manual pages are in %BUILDDIR%/man.