Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Use $(CURDIR) #662

Merged
merged 1 commit into from
Apr 11, 2017
Merged

Makefile: Use $(CURDIR) #662

merged 1 commit into from
Apr 11, 2017

Conversation

glevand
Copy link
Contributor

@glevand glevand commented Apr 5, 2017

The current makefile variable 'PWD' is not defined in the makefile,
and leads to build errors. Use $(shell pwd) instead.

Fixes errors like these:

docker: Error response from daemon: Invalid volume spec ":/go/src/github.com/coreos/flannel:ro"

@tomdee
Copy link
Contributor

tomdee commented Apr 10, 2017

I think it would be better to change ${PWD} to the make variable $(CURDIR)

The current makefile variable PWD is not defined in the makefile,
and leads to build errors.  Use CURDIR instead.

Fixes errors like these:

  docker: Error response from daemon: Invalid volume spec ":/go/src/github.com/coreos/flannel:ro"

Signed-off-by: Geoff Levand <[email protected]>
@glevand
Copy link
Contributor Author

glevand commented Apr 10, 2017

Rebased to latest, changed $(shell pwd) to $(CURDIR.

@glevand glevand changed the title Makefile: Use 'shell pwd' Makefile: Use $(CURDIR) Apr 10, 2017
@tomdee
Copy link
Contributor

tomdee commented Apr 11, 2017

LGTM - merging

@tomdee tomdee merged commit c00e6f6 into flannel-io:master Apr 11, 2017
@glevand glevand deleted the for-merge-make branch April 12, 2017 00:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants