Attachment #207298 for bug #289278




modinfo_LDADD = $(LDADD) libmodtools.a
modindex_LDADD = $(LDADD) libmodtools.a

if WITH_DOC
MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
SGML = $(addprefix doc/,  $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
dist_man_MANS = $(MAN5) $(MAN8)
endif
# If they haven't overridden mandir, fix it (never /man!)
mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)


Lines 29-40 Link Here

(-)configure.ac.orig (-5 / +14 lines)
29	AC_PROG_CC	29	AC_PROG_CC
30	AC_PROG_RANLIB	30	AC_PROG_RANLIB
31		31
32	AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)	32	AC_ARG_WITH(doc,
33	if test x"$DOCBOOKTOMAN" = xno	33	AS_HELP_STRING([--with-doc], [Build man pages (requires docbooktoman)]),
		34	[WITH_DOC=${withval}],
		35	[WITH_DOC=no])
		36	AM_CONDITIONAL(WITH_DOC, test "yes" = "${WITH_DOC}")
		37
		38	if test "yes" = "${WITH_DOC}"
34	then	39	then
35	AC_MSG_WARN([docbook2man not found])	40	AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
36	# fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile	41	if test x"$DOCBOOKTOMAN" = xno
37	DOCBOOKTOMAN=docbook2man	42	then
		43	AC_MSG_WARN([docbook2man not found, skipping man page generation])
		44	# fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
		45	DOCBOOKTOMAN=docbook2man
		46	fi
38	fi	47	fi
39		48
40	# Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish	49	# Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish

Return to bug 289278

Lines 36-45 Link Here

(-)Makefile.am.orig (+2 lines)
36	modinfo_LDADD = $(LDADD) libmodtools.a	36	modinfo_LDADD = $(LDADD) libmodtools.a
37	modindex_LDADD = $(LDADD) libmodtools.a	37	modindex_LDADD = $(LDADD) libmodtools.a
38		38
		39	if WITH_DOC
39	MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5	40	MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
40	MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8	41	MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
41	SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))	42	SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
42	dist_man_MANS = $(MAN5) $(MAN8)	43	dist_man_MANS = $(MAN5) $(MAN8)
		44	endif
43	# If they haven't overridden mandir, fix it (never /man!)	45	# If they haven't overridden mandir, fix it (never /man!)
44	mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)	46	mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
45		47