From 6ee4289a950c10582e587e27ba1c5c0a410b4421 Mon Sep 17 00:00:00 2001
From: Yoshiki Shibukawa <shibukawa.yoshiki@dena.jp>
Date: Fri, 2 Sep 2016 15:25:22 +0900
Subject: [PATCH] Fix doc/Makefile that can't build man because of doc/man
 folder exists

---
 CHANGES      | 2 ++
 doc/Makefile | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 41f0055df..e1fd628a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Release 1.4.9 (in development)
 Bugs fixed
 ----------
 
+* #2936: Fix doc/Makefile that can't build man because doc/man exists
+
 Release 1.4.8 (released Oct 1, 2016)
 ====================================
 
diff --git a/doc/Makefile b/doc/Makefile
index 559096493..dcd67186d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,3 +1,4 @@
+.PHONY: man
 # Makefile for Sphinx documentation
 #
 
@@ -12,6 +13,9 @@ BUILDDIR     = _build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
+man:
+	@$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: