summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjpsollie <janpieter.sollie@edpnet.be>2021-07-24 09:50:52 +0200
committerKent Overstreet <kent.overstreet@gmail.com>2021-07-24 17:10:10 -0400
commitcb09c48a26d9ecba4c13ddf4b7f4d88e246b56d9 (patch)
treec07f1c884cb33afb44e94514a653b72d1f1bc849
parentd6415ce25b71230d252b20b3b84386690db72516 (diff)
fixup! rst2man detection hangs
rst2man tend to hang when called without arguments, so a small -V is appended to print the version. Also, make sure we found at least one rst2man executable Signed-off-by: jpsollie <janpieter.sollie@edpnet.be>
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bdcc5d39..596357c7 100644
--- a/Makefile
+++ b/Makefile
@@ -61,18 +61,22 @@ else
INITRAMFS_DIR=/etc/initramfs-tools
endif
-var := $(shell rst2man 2>/dev/null)
+var := $(shell rst2man -V 2>/dev/null)
ifeq ($(.SHELLSTATUS),0)
RST2MAN=rst2man
endif
-var := $(shell rst2man.py 2>/dev/null)
+var := $(shell rst2man.py -V 2>/dev/null)
ifeq ($(.SHELLSTATUS),0)
RST2MAN=rst2man.py
endif
undefine var
+ifeq (,$(RST2MAN))
+ @echo "WARNING: no RST2MAN found!"
+endif
+
.PHONY: all
all: bcachefs bcachefs.5