From 9990e75bfeae0d65cb6b6774866fd50462e142b2 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 19 Oct 2016 00:20:42 +1100 Subject: [PATCH] make: fix doc install wildcards Due to how Makefiles are parsed, we have to delay the expansion of the $(wildcard ...) until the actual install target is being executed. Signed-off-by: Aleksa Sarai --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 82a076c1..6f83c3e1 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,8 @@ localintegration: binaries binaries: ocid ocic conmon pause -MANPAGES_MD = $(wildcard docs/*.md) +MANPAGES_MD := $(wildcard docs/*.md) +MANPAGES := $(MANPAGES_MD:%.md=%) docs/%.8: docs/%.8.md @which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false) @@ -88,7 +89,7 @@ docs/%.5: docs/%.5.md @which go-md2man > /dev/null 2>/dev/null || (echo "ERROR: go-md2man not found. Consider 'make install.tools' target" && false) $(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ -docs: $(MANPAGES_MD:%.md=%) +docs: $(MANPAGES) install: all install -D -m 755 ocid ${INSTALLDIR}/ocid @@ -96,9 +97,9 @@ install: all install -D -m 755 conmon/conmon $(PREFIX)/libexec/ocid/conmon install -D -m 755 pause/pause $(PREFIX)/libexec/ocid/pause install -d $(PREFIX)/share/man/man8 - install -m 644 $(wildcard docs/*.8) $(PREFIX)/share/man/man8 + install -m 644 $(filter %.8,$(MANPAGES)) $(PREFIX)/share/man/man8 install -d $(PREFIX)/share/man/man5 - install -m 644 $(wildcard docs/*.5) $(PREFIX)/share/man/man5 + install -m 644 $(filter %.5,$(MANPAGES)) $(PREFIX)/share/man/man5 install -D -m 644 ocid.service $(PREFIX)/lib/systemd/system install -D -m 644 ocid.conf $(DESTDIR)/etc