Hi folks,
Following on from the analysis of patches I carried out, please find
attached an updated patch that prevents inetutils from installing man
pages for programs that are not going to be installed. Note that, as
this is aimed at going upstream, it actually disables installation of
man pages for *all* programs that have been disabled even though our
instructions only disable the servers.
Also note that I'm a makefile and autotools newbie, so this is probably
only slightly less hackish than our current patch. Does anyone know how
to prevent `make' from descending into directories we know we don't
need? I thought about just building up the SUBDIRS variable in the
top-level Makefile dependent on which *_BUILD variables are set. Does
that sound feasible?
Thanks,
Matt.
Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
Date: 2006-08-09
Initial Package Version: 1.4.2
Origin: Matthew Burgess
Description: Prevent installation of man pages for programs that are not going
to be built/installed
diff -Naur inetutils-1.4.2.orig/ftp/Makefile.in inetutils-1.4.2/ftp/Makefile.in
--- inetutils-1.4.2.orig/ftp/Makefile.in 2002-12-23 04:30:11.000000000 +0000
+++ inetutils-1.4.2/ftp/Makefile.in 2006-08-09 19:15:50.000000000 +0000
@@ -173,7 +173,9 @@
noinst_HEADERS = extern.h ftp_var.h
-man_MANS = ftp.1
+ifeq ($(ftp_BUILD), ftp)
+ man_MANS = ftp.1
+endif
INCLUDES = $(PATHDEF_TMP) $(PATHDEF_BSHELL) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/ftpd/Makefile.in inetutils-1.4.2/ftpd/Makefile.in
--- inetutils-1.4.2.orig/ftpd/Makefile.in 2002-12-23 04:30:12.000000000 +0000
+++ inetutils-1.4.2/ftpd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -177,7 +177,9 @@
noinst_HEADERS = extern.h
-man_MANS = ftpd.8
+ifeq ($(ftpd_BUILD), ftpd)
+ man_MANS = ftpd.8
+endif
INCLUDES = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
$(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
diff -Naur inetutils-1.4.2.orig/inetd/Makefile.in inetutils-1.4.2/inetd/Makefile.in
--- inetutils-1.4.2.orig/inetd/Makefile.in 2002-12-23 04:30:13.000000000 +0000
+++ inetutils-1.4.2/inetd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -172,7 +172,9 @@
inetd_SOURCES = inetd.c
-man_MANS = inetd.8
+ifeq ($(inetd_BUILD), inetd)
+ man_MANS = inetd.8
+endif
INCLUDES = $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/logger/Makefile.in inetutils-1.4.2/logger/Makefile.in
--- inetutils-1.4.2.orig/logger/Makefile.in 2002-12-23 04:30:16.000000000 +0000
+++ inetutils-1.4.2/logger/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -175,7 +175,9 @@
logger_SOURCES = logger.c
-man_MANS = logger.1
+ifeq ($(logger_BUILD), logger)
+ man_MANS = logger.1
+endif
EXTRA_DIST = $(man_MANS)
subdir = logger
diff -Naur inetutils-1.4.2.orig/ping/Makefile.in inetutils-1.4.2/ping/Makefile.in
--- inetutils-1.4.2.orig/ping/Makefile.in 2002-12-23 04:30:16.000000000 +0000
+++ inetutils-1.4.2/ping/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -169,7 +169,9 @@
EXTRA_PROGRAMS = ping
-man_MANS = ping.8
+ifeq ($(ping_BUILD), ping)
+ man_MANS = ping.8
+endif
EXTRA_DIST = $(man_MANS)
LDADD = -L../libinetutils -linetutils -lm -L../libicmp -licmp
diff -Naur inetutils-1.4.2.orig/rcp/Makefile.in inetutils-1.4.2/rcp/Makefile.in
--- inetutils-1.4.2.orig/rcp/Makefile.in 2002-12-23 04:30:16.000000000 +0000
+++ inetutils-1.4.2/rcp/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -173,7 +173,9 @@
noinst_HEADERS = extern.h
-man_MANS = rcp.1
+ifeq ($(rcp_BUILD), rcp)
+ man_MANS = rcp.1
+endif
INCLUDES = $(PATHDEF_RSH) $(PATHDEF_CP) $(PATHDEF_BSHELL) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/rexecd/Makefile.in inetutils-1.4.2/rexecd/Makefile.in
--- inetutils-1.4.2.orig/rexecd/Makefile.in 2002-12-23 04:30:17.000000000 +0000
+++ inetutils-1.4.2/rexecd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -173,7 +173,9 @@
rexecd_SOURCES = rexecd.c
-man_MANS = rexecd.8
+ifeq ($(rexecd_BUILD), rexecd)
+ man_MANS = rexecd.8
+endif
INCLUDES = $(PATHDEF_DEFPATH) $(PATHDEF_BSHELL) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/rlogin/Makefile.in inetutils-1.4.2/rlogin/Makefile.in
--- inetutils-1.4.2.orig/rlogin/Makefile.in 2002-12-23 04:30:17.000000000 +0000
+++ inetutils-1.4.2/rlogin/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -173,7 +173,9 @@
rlogin_SOURCES = rlogin.c
-man_MANS = rlogin.1
+ifeq ($(rlogin_BUILD), rlogin)
+ man_MANS = rlogin.1
+endif
LDADD = -L../libinetutils -linetutils
diff -Naur inetutils-1.4.2.orig/rlogind/Makefile.in inetutils-1.4.2/rlogind/Makefile.in
--- inetutils-1.4.2.orig/rlogind/Makefile.in 2002-12-23 04:30:18.000000000 +0000
+++ inetutils-1.4.2/rlogind/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -173,7 +173,9 @@
rlogind_SOURCES = rlogind.c
-man_MANS = rlogind.8
+ifeq ($(rlogind_BUILD), rlogind)
+ man_MANS = rlogind.8
+endif
INCLUDES = $(PATHDEF_DEV) $(PATHDEF_LOGIN) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/rsh/Makefile.in inetutils-1.4.2/rsh/Makefile.in
--- inetutils-1.4.2.orig/rsh/Makefile.in 2002-12-23 04:30:18.000000000 +0000
+++ inetutils-1.4.2/rsh/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -171,7 +171,9 @@
rsh_SOURCES = rsh.c
-man_MANS = rsh.1
+ifeq ($(rsh_BUILD), rsh)
+ man_MANS = rsh.1
+endif
INCLUDES = $(PATHDEF_RLOGIN) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/rshd/Makefile.in inetutils-1.4.2/rshd/Makefile.in
--- inetutils-1.4.2.orig/rshd/Makefile.in 2002-12-23 04:30:19.000000000 +0000
+++ inetutils-1.4.2/rshd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -172,7 +172,9 @@
rshd_SOURCES = rshd.c
-man_MANS = rshd.8
+ifeq ($(rshd_BUILD), rshd)
+ man_MANS = rshd.8
+endif
INCLUDES = $(PATHDEF_BSHELL) $(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/syslogd/Makefile.in inetutils-1.4.2/syslogd/Makefile.in
--- inetutils-1.4.2.orig/syslogd/Makefile.in 2002-12-23 04:30:19.000000000 +0000
+++ inetutils-1.4.2/syslogd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -172,7 +172,9 @@
syslogd_SOURCES = syslogd.c
-man_MANS = syslog.conf.5 syslogd.8
+ifeq ($(syslogd_BUILD), syslogd)
+ man_MANS = syslog.conf.5 syslogd.8
+endif
INCLUDES = $(PATHDEF_LOG) $(PATHDEF_LOGCONF) $(PATHDEF_LOGPID) \
$(PATHDEF_CONSOLE) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/talk/Makefile.in inetutils-1.4.2/talk/Makefile.in
--- inetutils-1.4.2.orig/talk/Makefile.in 2002-12-23 04:30:19.000000000 +0000
+++ inetutils-1.4.2/talk/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -173,7 +173,9 @@
noinst_HEADERS = talk.h talk_ctl.h
-man_MANS = talk.1
+ifeq ($(talk_BUILD), talk)
+ man_MANS = talk.1
+endif
INCLUDES = $(NCURSES_INCLUDE) -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/talkd/Makefile.in inetutils-1.4.2/talkd/Makefile.in
--- inetutils-1.4.2.orig/talkd/Makefile.in 2002-12-23 04:30:20.000000000 +0000
+++ inetutils-1.4.2/talkd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -179,8 +179,9 @@
talkd.c\
intalkd.h
-
-man_MANS = talkd.8
+ifeq ($(talkd_BUILD), talkd)
+ man_MANS = talkd.8
+endif
INCLUDES = $(PATHDEF_DEV) -I${top_srcdir}/libinetutils -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/telnet/Makefile.in inetutils-1.4.2/telnet/Makefile.in
--- inetutils-1.4.2.orig/telnet/Makefile.in 2002-12-23 04:30:20.000000000 +0000
+++ inetutils-1.4.2/telnet/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -176,7 +176,9 @@
noinst_HEADERS = defines.h externs.h fdset.h general.h ring.h types.h
-man_MANS = telnet.1
+ifeq ($(telnet_BUILD), telnet)
+ man_MANS = telnet.1
+endif
INCLUDES = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK -I$(top_builddir)/include
diff -Naur inetutils-1.4.2.orig/telnetd/Makefile.in inetutils-1.4.2/telnetd/Makefile.in
--- inetutils-1.4.2.orig/telnetd/Makefile.in 2002-12-23 04:30:21.000000000 +0000
+++ inetutils-1.4.2/telnetd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -176,7 +176,9 @@
noinst_HEADERS = telnetd.h
-man_MANS = telnetd.8
+ifeq ($(telnetd_BUILD), telnetd)
+ man_MANS = telnetd.8
+endif
INCLUDES = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN) -I$(top_builddir)/include \
-I$(top_srcdir) @INCAUTH@
diff -Naur inetutils-1.4.2.orig/tftp/Makefile.in inetutils-1.4.2/tftp/Makefile.in
--- inetutils-1.4.2.orig/tftp/Makefile.in 2002-12-23 04:30:21.000000000 +0000
+++ inetutils-1.4.2/tftp/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -175,7 +175,9 @@
noinst_HEADERS = extern.h
-man_MANS = tftp.1
+ifeq ($(tftp_BUILD), tftp)
+ man_MANS = tftp.1
+endif
LDADD = -L../libinetutils -linetutils
diff -Naur inetutils-1.4.2.orig/tftpd/Makefile.in inetutils-1.4.2/tftpd/Makefile.in
--- inetutils-1.4.2.orig/tftpd/Makefile.in 2002-12-23 04:30:22.000000000 +0000
+++ inetutils-1.4.2/tftpd/Makefile.in 2006-08-09 19:15:25.000000000 +0000
@@ -174,7 +174,9 @@
tftpd_SOURCES = tftpd.c
-man_MANS = tftpd.8
+ifeq ($(tftpd_BUILD), tftpd)
+ man_MANS = tftpd.8
+endif
LDADD = -L../libinetutils -linetutils
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
