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

Merge pull request #141 from 14rcole/manpage-install

Browse source 
Fix installation of manpages
This commit is contained in:
Mrunal Patel 2016-10-14 08:20:28 -07:00 committed by GitHub
commit 6206c2e6ae
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -53,7 +53,7 @@ clean:
rm -f ${OCID_LINK} rm -f ${OCID_LINK}
rm -f conmon/conmon.o conmon/conmon rm -f conmon/conmon.o conmon/conmon
rm -f pause/pause.o pause/pause rm -f pause/pause.o pause/pause
rm -f docs/*.1 docs/*.5 docs/*.8 rm -f docs/*.1 docs/*.5{,.gz} docs/*.8{,.gz}
find . -name \*~ -delete find . -name \*~ -delete
find . -name \#\* -delete find . -name \#\* -delete
@ -80,10 +80,12 @@ MANPAGES_MD = $(wildcard docs/*.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)
$(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GO_MD2MAN) -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
gzip -k $@
docs/%.5: docs/%.5.md 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 $@
gzip -k $@
docs: $(MANPAGES_MD:%.md=%) docs: $(MANPAGES_MD:%.md=%)
@ -93,9 +95,9 @@ install: ocid.conf
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.md) $(PREFIX)/share/man/man8 install -m 644 $(wildcard docs/*.8.gz) $(PREFIX)/share/man/man8
install -d $(PREFIX)/share/man/man5 install -d $(PREFIX)/share/man/man5
install -m 644 $(wildcard docs/*.5.md) $(PREFIX)/share/man/man5 install -m 644 $(wildcard docs/*.5.gz) $(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
@ -105,10 +107,10 @@ uninstall:
rm -f $(PREFIX)/lib/systemd/system/ocid.service rm -f $(PREFIX)/lib/systemd/system/ocid.service
rm -f ${INSTALLDIR}/{ocid,ocic} rm -f ${INSTALLDIR}/{ocid,ocic}
rm -f $(PREFIX)/libexec/ocid/{conmon,pause} rm -f $(PREFIX)/libexec/ocid/{conmon,pause}
for i in $(wildcard docs/*.8.md); do \ for i in $(wildcard docs/*.8.gz); do \
rm -f $(PREFIX)/share/man/man8/$$(basename $${i}); \ rm -f $(PREFIX)/share/man/man8/$$(basename $${i}); \
done done
for i in $(wildcard docs/*.5.md); do \ for i in $(wildcard docs/*.5.gz); do \
rm -f $(PREFIX)/share/man/man5/$$(basename $${i}); \ rm -f $(PREFIX)/share/man/man5/$$(basename $${i}); \
done done