vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make: fix doc install wildcards

Browse source 
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 <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2016-10-19 00:20:42 +11:00
parent 5f9517a17a
commit 9990e75bfe
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -78,7 +78,8 @@ localintegration: binaries
binaries: ocid ocic conmon pause binaries: ocid ocic conmon pause
MANPAGES_MD = $(wildcard docs/*.md) MANPAGES_MD := $(wildcard docs/*.md)
MANPAGES := $(MANPAGES_MD:%.md=%)
docs/%.8: docs/%.8.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) @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) @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 $@ $(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs: $(MANPAGES_MD:%.md=%) docs: $(MANPAGES)
install: all install: all
install -D -m 755 ocid ${INSTALLDIR}/ocid 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 conmon/conmon $(PREFIX)/libexec/ocid/conmon
install -D -m 755 pause/pause $(PREFIX)/libexec/ocid/pause install -D -m 755 pause/pause $(PREFIX)/libexec/ocid/pause
install -d $(PREFIX)/share/man/man8 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 -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.service $(PREFIX)/lib/systemd/system
install -D -m 644 ocid.conf $(DESTDIR)/etc install -D -m 644 ocid.conf $(DESTDIR)/etc