2 files changed, 1 insertions, 62 deletions

diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch
deleted file mode 100644
index faefd1d4ea..0000000000
--- a/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b71eb384522b5ce4629dee6e8be257fb4880fef3 Mon Sep 17 00:00:00 2001 
-From: Benjamin Gaignard <benjamin.gaignard@linaro.org> 
-Date: Thu, 20 Apr 2017 14:25:18 +0200
-
----
-Upstream-Status: Pending
-
- Makefile.am  |  1 -
- configure.ac | 17 -----------------
- 2 files changed, 18 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4a3ead6..a12cb98 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@ SUBDIRS = \
-        src \
-        data \
-        etc \
--       docs \
-        m4macros \
-        tests \
-        scripts
-diff --git a/configure.ac b/configure.ac
-index 3849383..9f3a633 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -179,18 +179,6 @@ AC_SUBST(CPPFLAGS)
- AC_SUBST(LIBS)
- AC_SUBST(ADDITIONAL_OBJECTS)
- 
--if test x"$manpage_support_enabled" = x"yes"; then
--AC_PATH_PROG(POD2MAN, pod2man, no)
--
--if test "x$POD2MAN" = "xno" && \
-- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
--AC_MSG_ERROR([
--  manpage generation requested, but neither pod2man
--  nor pre-generated manpages found.
--  Use --disable-manpage-support if you want to compile anyway.])
--fi
--fi #manpage_support_enabled
--
- AM_CONDITIONAL(HAVE_POD2MAN, test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno")
- 
- AC_PATH_PROG(GPERF, gperf, no)
-@@ -216,11 +204,6 @@ src/Makefile
- data/Makefile
- data/templates/Makefile
- etc/Makefile
--docs/Makefile
--docs/man5/Makefile
--docs/man5/tinyproxy.conf.txt
--docs/man8/Makefile
--docs/man8/tinyproxy.txt
- m4macros/Makefile
- tests/Makefile
- tests/scripts/Makefile
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb
index 222cc8d7c6..8558291c18 100644
--- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb
+++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.2.bb
@@ -4,7 +4,6 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \
-           file://disable-documentation.patch \
            file://tinyproxy.service \
            file://tinyproxy.conf \
            file://run-ptest \
@@ -21,6 +20,7 @@ EXTRA_OECONF += " \
         --enable-reverse \
         --enable-upstream \
         --enable-xtinyproxy \
+        --enable-manpage_support=no \
         "
 
 inherit autotools systemd useradd ptest