1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
|
From 2e85d040ad0b5e1bb5caaa374e8abe75e290a2ee Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Wed, 9 Jun 2010 03:56:08 +0200
Subject: [PATCH 1/5] build: Disable GFDL info files and useless man pages
We do not install the info file due to GFDL, and because it would
require an inetutils-doc package. Nor the man pages from upstream
generated with help2man as they are problematic for cross-building
and contain no additional information to what is already available
via --help output.
Instead we ship our own proper man pages.
Not forwarded upstream due to GNU policies regarding man pages.
Origin: vendor, Debian
Forwarded: not-needed
diff --git a/Makefile.am b/Makefile.am
index 144d9fe5..46cae1a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST += bootstrap bootstrap.conf bootstrap-funclib.sh
SUBDIRS = lib \
libinetutils libtelnet libicmp libls \
src telnet telnetd ftp ftpd talk talkd whois ping ifconfig \
- doc man \
tests
DISTCLEANFILES = pathdefs.make paths.defs
diff --git a/bootstrap.conf b/bootstrap.conf
index 297964e1..6b97af38 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,8 +24,6 @@ autoconf 2.59
automake 1.11.1
bison 2.3
m4 -
-makeinfo -
-help2man -
gzip -
xz -
"
diff --git a/configure.ac b/configure.ac
index fe60ef35..564c3a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,6 @@ AC_PROG_RANLIB
AC_PROG_YACC
AC_PROG_LN_S
AC_PROG_SED
-AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AC_ARG_VAR(GREP, [Location of preferred 'grep' utility.])
AC_ARG_VAR(EGREP, [Location of preferred 'egrep' utility.])
AC_ARG_VAR(FGREP, [Location of preferred 'fgrep' utility.])
@@ -986,8 +985,6 @@ whois/Makefile
ping/Makefile
ifconfig/Makefile
ifconfig/system/Makefile
-doc/Makefile
-man/Makefile
tests/Makefile
confpaths.h:confpaths.h.in
])
--
2.47.2
|