Michal Marek napsal(a): > Subject: [PATCH] Don't abort the build if docbook2man is missing > > Instead of aborting the build, print a warning if neither > docbook2man nor docbook-to-man is found. Also, don't hide > or mangle docbook2man / docbook-to-man errors in the Makefile. > > Signed-off-by: Michal Marek <[email protected]> > --- > Makefile.am | 9 +++++++-- > configure.ac | 4 +++- > 2 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index bf9292f..412b4b9 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -47,9 +47,14 @@ MAINTAINERCLEANFILES := $(man_MANS) > # docbook2man writes file itself, doesn't do stdout. > %.8: doc/%.sgml > if [ "$(DOCBOOKTOMAN)" = "docbook2man" ]; then \ > - $(DOCBOOKTOMAN) $< > /dev/null 2>&1; \ > + $(DOCBOOKTOMAN) $< >/dev/null; \ > else \ > - $(DOCBOOKTOMAN) $< 2>&1 > $@ | sed 's/^[^:]*://'; \ > + if $(DOCBOOKTOMAN) $< > [email protected]; then \ > + mv -f [email protected] $@; \ > + else \ > + rm -f [email protected]; \ > + exit 1; \ > + fi \ > fi > > %.5: doc/%.sgml > diff --git a/configure.ac b/configure.ac > index 9f09102..7b860b1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -22,7 +22,9 @@ AC_PROG_CC > AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, [no],) > if test x"$DOCBOOKTOMAN" = xno > then > - AC_MSG_ERROR([docbook2man not found]) > + AC_MSG_WARN([docbook2man not found]) > + # fail with a meaningfull error if $DOCBOOKTOMAN called by the makefile > + DOCBOOKTOMAN='${top_srcdir}/missing docbook2man' > fi > > # Delay adding the zlib_flags until after AC_PROG_CC, so we can distinguish
John? Can this be merged? Michal -- To unsubscribe from this list: send the line "unsubscribe linux-modules" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
