From f5712ca277d21cc72183038c482cf2bbfe9a320a Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 26 Feb 2017 21:44:17 +0000
Subject: [PATCH] Makefile.am: Remove distribution man pages when running 'make
 clean'

---
 docs/Makefile.am              | 3 ++-
 docs/libcurl/Makefile.am      | 7 +++++--
 docs/libcurl/opts/Makefile.am | 4 +++-
 tests/Makefile.am             | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index ee8f607185..eee44d8752 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -26,12 +26,13 @@ man_MANS = curl.1 curl-config.1
 noinst_man_MANS = mk-ca-bundle.1
 GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html
 PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf
+MANDISTPAGES = curl.1.dist curl-config.1.dist
 
 HTMLPAGES = $(GENHTMLPAGES) index.html
 
 SUBDIRS = examples libcurl cmdline-opts
 
-CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) curl.1
+CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1
 
 EXTRA_DIST = MANUAL BUGS CONTRIBUTE.md FAQ FEATURES INTERNALS.md SSLCERTS.md  \
  README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS KNOWN_BUGS \
diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index 225fa9ffb9..a27e60745f 100644
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -43,14 +43,17 @@ man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3	 \
  curl_multi_socket_action.3 curl_multi_wait.3 libcurl-symbols.3 	 \
  libcurl-thread.3 curl_multi_socket_all.3
 
+man_DISTMANS = $(man_MANS:.3=.3.dist)
+
 HTMLPAGES = $(man_MANS:.3=.html)
 
 PDFPAGES = $(man_MANS:.3=.pdf)
-
+ 
 m4macrodir = $(datadir)/aclocal
 dist_m4macro_DATA = libcurl.m4
 
-CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(TESTS) libcurl-symbols.3
+CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(TESTS) $(man_DISTMANS) \
+  libcurl-symbols.3
 
 EXTRA_DIST = $(man_MANS) index.html ABI symbols-in-versions symbols.pl  \
   mksymbolsmanpage.pl
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index 2392fb7db0..5829a144fe 100644
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -333,11 +333,13 @@ man_MANS =                                      \
  CURLOPT_XFERINFOFUNCTION.3                     \
  CURLOPT_XOAUTH2_BEARER.3
 
+man_DISTMANS = $(man_MANS:.3=.3.dist)
+
 HTMLPAGES = $(man_MANS:.3=.html)
 
 PDFPAGES = $(man_MANS:.3=.pdf)
 
-CLEANFILES = $(HTMLPAGES) $(PDFPAGES)
+CLEANFILES = $(HTMLPAGES) $(PDFPAGES) $(man_DISTMANS)
 
 EXTRA_DIST = $(man_MANS)
 MAN2HTML= roffit --mandir=. $< >$@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9dbf0e157..b733e2d57e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@
 
 HTMLPAGES = testcurl.html runtests.html
 PDFPAGES = testcurl.pdf runtests.pdf
+MANDISTPAGES = runtests.1.dist testcurl.1.dist
 
 EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl getpart.pm \
  FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl valgrind.pm ftp.pm   \
@@ -49,7 +50,7 @@ DIST_SUBDIRS = $(SUBDIRS) $(DIST_UNIT)
 
 PERLFLAGS = -I$(srcdir)
 
-CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid
+CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid $(MANDISTPAGES)
 
 MAN2HTML= roffit $< >$@