Browse Source

Merge pull request #6886 from tianon/no-binddir-if-docker_host

Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set
Tianon Gravi 11 years ago
parent
commit
77ed01c8da
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Makefile

+ 2 - 1
Makefile

@@ -1,7 +1,8 @@
 .PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli validate
 
 # to allow `make BINDDIR=. shell` or `make BINDDIR= test`
-BINDDIR := bundles
+# (default to no bind mount if DOCKER_HOST is set)
+BINDDIR := $(if $(DOCKER_HOST),,bundles)
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 8000