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

Merge pull request #184 from rhatdan/ocid.service

Browse source 
Fix install of unit file and configuration file
This commit is contained in:
Mrunal Patel 2016-10-31 12:05:31 -07:00 committed by GitHub
commit a742bf6a8e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -12,7 +12,7 @@ PREFIX ?= ${DESTDIR}/usr
BINDIR ?= ${PREFIX}/bin BINDIR ?= ${PREFIX}/bin
LIBEXECDIR ?= ${PREFIX}/libexec LIBEXECDIR ?= ${PREFIX}/libexec
MANDIR ?= ${PREFIX}/share/man MANDIR ?= ${PREFIX}/share/man
ETCDIR ?= ${PREFIX}/etc ETCDIR ?= ${DESTDIR}/etc
GO_MD2MAN ?= $(shell which go-md2man) GO_MD2MAN ?= $(shell which go-md2man)
export GOPATH := ${CURDIR}/vendor export GOPATH := ${CURDIR}/vendor
BUILDTAGS := selinux BUILDTAGS := selinux
@ -102,7 +102,7 @@ install:
install -D -m 644 ocid.conf $(ETCDIR)/ocid.conf install -D -m 644 ocid.conf $(ETCDIR)/ocid.conf
install.systemd: install.systemd:
install -D -m 644 contrib/systemd/ocid.service $(PREFIX)/lib/systemd/system install -D -m 644 contrib/systemd/ocid.service $(PREFIX)/lib/systemd/system/ocid.service
uninstall: uninstall:
rm -f $(BINDIR)/{ocid,ocic} rm -f $(BINDIR)/{ocid,ocic}