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
|
Disable manual pages generation when docbook2man is not available.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile.am | 7 ++++++-
configure.ac | 7 +++----
2 files changed, 9 insertions(+), 5 deletions(-)
Index: module-init-tools-3.11/Makefile.am
===================================================================
--- module-init-tools-3.11.orig/Makefile.am
+++ module-init-tools-3.11/Makefile.am
@@ -39,7 +39,12 @@
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)
+
+if HAVE_DOCBOOKTOMAN
+MANPAGES = $(MAN5) $(MAN8)
+endif
+dist_man_MANS = $(MANPAGES)
+
# 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)
Index: module-init-tools-3.11/configure.ac
===================================================================
--- module-init-tools-3.11.orig/configure.ac
+++ module-init-tools-3.11/configure.ac
@@ -29,13 +29,12 @@
AC_PROG_CC
AC_PROG_RANLIB
-AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],)
-if test x"$DOCBOOKTOMAN" = xno
+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man)
+if test x"$DOCBOOKTOMAN" = x
then
AC_MSG_WARN([docbook2man not found])
- # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile
- DOCBOOKTOMAN=docbook2man
fi
+AM_CONDITIONAL([HAVE_DOCBOOKTOMAN], [test "x$DOCBOOKTOMAN" != "x"])
# Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
# between a broken cc and a working cc but missing libz.a.
|
