commit 2cea6a01a57a8f1ad71ba9cf838186d62987d30a
author Mike Marchetti <mmarchetti@sandvine.com> Fri Oct 13 13:58:54 2017 -0400
committer Mike Marchetti <mmarchetti@sandvine.com> Fri Oct 13 13:58:54 2017 -0400
tree d9f6c030102d4a2ffad684440c75d01014833995
parent 8d38950dbdd0459d78fef2c594236e03d7945e66

bug 381 fix

- fixup ping_pong Makefile
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

juju-charms/Makefile

diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index 76d21ac..d6aa754 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -24,12 +24,19 @@
 CHARM_SRC_DIRS := $(addprefix $(CHARM_SRC_DIR)/, $(CHARMS))
 CHARM_BUILD_DIRS := $(addprefix $(CHARM_BUILD_DIR)/, $(CHARMS))
 CHARM_DOCKER_TAG := charm-tools
+DOCKER_BUILD     ?=
 
 all: $(CHARM_BUILD_DIRS)
 
 clean:
 	-@ $(RM) -rf $(CHARM_BUILD_DIR)
 
+
+ifdef DOCKER_BUILD
 $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
 	docker build -t $(CHARM_DOCKER_TAG) .
 	docker run -u $$(id -u):$$(id -g) -v$$(pwd):$$(pwd) -w$$(pwd) $(CHARM_DOCKER_TAG) charm-build -o $(BUILD_DIR) $<
+else
+$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
+	charm-build -o $(BUILD_DIR) $<
+endif