commit 600947e69d9b99bdba1656c9983880cdd55c3579
author Shyam Jayaraman <bjornick@google.com> Mon Dec 07 13:48:12 2015 -0800
committer Shyam Jayaraman <bjornick@google.com> Mon Dec 07 13:48:12 2015 -0800
tree e0c49e25757745849e30d49e9a8947dc121de14e
parent 8a9bccf573d7908b451278c408a54bfbac331cd3

use CURDIR instead of pwd.

Change-Id: If71526d576f60c4e8ecaf15327df9620d4f78b31

mojo.mk

diff --git a/mojo.mk b/mojo.mk
index 821f911..114479e 100644
--- a/mojo.mk
+++ b/mojo.mk
@@ -30,7 +30,7 @@
 MOJO_SHARED_LIB := $(shell jiri v23-profile env --profiles=$(MOJO_PROFILE) --target=$(TARGET) MOJO_SYSTEM_THUNKS=)
 MOJO_SHELL := $(shell jiri v23-profile env --profiles=$(MOJO_PROFILE) --target=$(TARGET) MOJO_SHELL=)
 
-export GOPATH := $(PWD)/go:$(PWD)/gen/go
+export GOPATH := $(GOPATH):$(CURDIR)/go:$(CURDIR)/gen/go
 
 # NOTE(nlacasse): Running Go Mojo services requires passing the
 # --enable-multiprocess flag to mojo_shell.  This is because the Go runtime is
@@ -63,7 +63,7 @@
 endef
 
 define MOJO_RUN
-	$(MOJO_DEVTOOLS)/mojo_run --config-file $(PWD)/mojoconfig --shell-path $(MOJO_SHELL) $(MOJO_SHELL_FLAGS) $(MOJO_ANDROID_FLAGS) $1
+	$(MOJO_DEVTOOLS)/mojo_run --config-file $(CURDIR)/mojoconfig --shell-path $(MOJO_SHELL) $(MOJO_SHELL_FLAGS) $(MOJO_ANDROID_FLAGS) $1
 endef
 
 .PHONY: mojo-env-check