From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Fri, 24 Feb 2017 02:28:27 +0000 (-0800)
Subject: man: make error message clearer for missing xstlproc
X-Git-Tag: v24~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72167ba113c00eea6eb73cd91ce173e5c734564b;p=thirdparty%2Fkmod.git

man: make error message clearer for missing xstlproc

We can't do at configure phase since we actually ship the built man pages with
dist, so it's fine not having xsltproc if building from dist. If building from
the repository, it's better to have have a better message saying xsltproc was
not found than trying to execute the argument to xsltproc. Now message is:

  XSLT     depmod.d.5
  /bin/sh: line 1: xsltproc: command not found

Instead of:

  XSLT     depmod.d.5
  /bin/sh: --nonet: command not found
---

diff --git a/man/Makefile.am b/man/Makefile.am
index 1c53f63d..11514d52 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -6,20 +6,20 @@ AM_V_XSLT = $(AM_V_XSLT_$(V))
 AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
 AM_V_XSLT_0 = @echo "  XSLT    " $@;
 
+XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc)
+
 if BUILD_TOOLS
 dist_man_MANS = $(MAN5) $(MAN8) $(MAN_STUB)
 modules.dep.bin.5: modules.dep.5
 endif
 
 EXTRA_DIST = $(MAN5:%.5=%.xml) $(MAN8:%.8=%.xml)
-
-XSLTPROC_FLAGS = \
-	--nonet \
-	--stringparam man.output.quietly 1 \
-	--param funcsynopsis.style "'ansi'"
-
 CLEANFILES = $(dist_man_MANS)
 
 %.5 %.8: %.xml
-	$(AM_V_XSLT)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+	$(AM_V_XSLT)$(XSLT) \
+		-o $@ \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--param funcsynopsis.style "'ansi'" \
 		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<