merge branch 'pr-149'

LGTMs: @mrunalp @rhatdan Closes cri-o#149
sameo · Oct 31, 2016 · 2d80c88 · 2d80c88
2 parents cb7239c + b30ea45
commit 2d80c88
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ conmon/conmon
 conmon/conmon.o
 pause/pause
 pause/pause.o
-/docs/ocid.8
-/docs/ocid.conf.5
+/docs/*.[58]
+/docs/*.[58].gz
 vendor/src/github.com/kubernetes-incubator/cri-o
 ocid.conf
diff --git a/Makefile b/Makefile
@@ -40,11 +40,12 @@ conmon:
 pause:
 	make -C $@
 
-GO_SRC =  $(shell find . -name \*.go)
-ocid: $(GO_SRC) ${OCID_LINK}
+GO_SRC = $(shell find . -name \*.go)
+
+ocid: $(GO_SRC) | ${OCID_LINK}
 	go build --tags "$(BUILDTAGS)" -o $@ ./cmd/server/
 
-ocic: $(GO_SRC)
+ocic: $(GO_SRC) | ${OCID_LINK}
 	go build -o $@ ./cmd/client/
 
 ocid.conf: ocid
@@ -99,11 +100,12 @@ install: all
 	install -m 644 $(wildcard docs/*.8) $(PREFIX)/share/man/man8
 	install -d $(PREFIX)/share/man/man5
 	install -m 644 $(wildcard docs/*.5) $(PREFIX)/share/man/man5
-	install -D -m 644 ocid.service $(PREFIX)/lib/systemd/system
 	install -D -m 644 ocid.conf $(DESTDIR)/etc
 
+install.systemd:
+	install -D -m 644 ocid.service $(PREFIX)/lib/systemd/system
+
 uninstall:
-	rm -f $(PREFIX)/lib/systemd/system/ocid.service
 	rm -f ${INSTALLDIR}/{ocid,ocic}
 	rm -f $(PREFIX)/libexec/ocid/{conmon,pause}
 	for i in $(wildcard docs/*.8); do \

diff --git a/ocid.service → contrib/systemd/ocid.service b/ocid.service → contrib/systemd/ocid.service