diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-11-10 08:25:25 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-11-11 21:41:21 +0100 |
| commit | 7c60be98b2d898e5d49b0fa305b7f56dec59a366 (patch) | |
| tree | 736fc30d388ae0cd980d345b44b22f3437e70235 /package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch | |
| parent | ba2a0cf5a135873ab0029a43de7d0bf82d6578df (diff) | |
| download | buildroot-novena-7c60be98b2d898e5d49b0fa305b7f56dec59a366.tar.gz buildroot-novena-7c60be98b2d898e5d49b0fa305b7f56dec59a366.zip | |
module-init-tools: bump to version 3.15
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch')
| -rw-r--r-- | package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch deleted file mode 100644 index 28f51de11..000000000 --- a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -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. |