Skip to content

Commit

Permalink
Merge pull request opencontainers#262 from hqhq/add_runtime_tools_link
Browse files Browse the repository at this point in the history
Add RUNTIME_TOOLS_LINK in Makefile
  • Loading branch information
vbatts authored Nov 3, 2016
2 parents e46709a + 12c0532 commit bb04048
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ oci

*.1
*.patch

# Temporary symbol links
Godeps/_workspace/src/github.com/opencontainers/runtime-tools
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ PREFIX ?= $(DESTDIR)/usr
BINDIR ?= $(DESTDIR)/usr/bin

BUILDTAGS=
RUNTIME_TOOLS_LINK := $(CURDIR)/Godeps/_workspace/src/github.com/opencontainers/runtime-tools
export GOPATH:=$(CURDIR)/Godeps/_workspace:$(GOPATH)

all:
all: $(RUNTIME_TOOLS_LINK)
go build -tags "$(BUILDTAGS)" -o oci-runtime-tool ./cmd/oci-runtime-tool
go build -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest

Expand All @@ -24,6 +25,10 @@ install: man

clean:
rm -f oci-runtime-tool runtimetest *.1
rm -f $(RUNTIME_TOOLS_LINK)

$(RUNTIME_TOOLS_LINK):
ln -sf $(CURDIR) $(RUNTIME_TOOLS_LINK)

.PHONY: test .gofmt .govet .golint

Expand Down

0 comments on commit bb04048

Please sign in to comment.