Module: kamailio Branch: master Commit: 35aef078dfbcb92de9591eea2841b3ba0f9682f6 URL: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2018-08-31T12:45:24+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 --- Modified: src/Makefile.modules Modified: src/Makefile.shared Modified: src/Makefile.utils --- Diff: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Patch: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index bbcca26122..8649db2756 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -278,16 +278,17 @@ endif #man page build rules ifneq (,$(wildcard $(MOD_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(MOD_NAME).7: $(MOD_NAME).xml - $(DOCBOOK) -s ../../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../../doc/stylesheets/serdoc2man.xsl $< man: $(MOD_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(MOD_NAME).xml" +endif +else +man: endif diff --git a/src/Makefile.shared b/src/Makefile.shared index 82a29d2447..9d2d81fe65 100644 --- a/src/Makefile.shared +++ b/src/Makefile.shared @@ -43,8 +43,8 @@ sh_err_fail= try_err=$(1) ; if [ $$? != 0 ]; then echo ERROR: $(1) failed ; fi endif -DOCBOOK = $(shell which docbook2x-man 2>/dev/null) -ifeq ($(DOCBOOK),) - DOCBOOK = $(shell which db2x_docbook2man 2>/dev/null) +DOCBOOKMAN = $(shell which docbook2x-man 2>/dev/null) +ifeq ($(DOCBOOKMAN),) + DOCBOOKMAN = $(shell which db2x_docbook2man 2>/dev/null) endif diff --git a/src/Makefile.utils b/src/Makefile.utils index f7ce508e17..e8a8b8a1a6 100644 --- a/src/Makefile.utils +++ b/src/Makefile.utils @@ -117,16 +117,17 @@ endif #man page build rules ifneq (,$(wildcard $(UTIL_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(UTIL_NAME).7: $(UTIL_NAME).xml - $(DOCBOOK) -s ../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../doc/stylesheets/serdoc2man.xsl $< man: $(UTIL_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(UTIL_NAME).xml" +endif +else +man: endif $(man_prefix)/$(man_dir)/man8: