Rename juju-charms -> charms
Per discussion at the previous F2F, we are renaming "juju-charms" to
simply be "charms". This makes the necessary changes across the devops
repo.
Signed-off-by: Adam Israel <adam.israel@canonical.com>
Change-Id: I95651dbdbb29f9c3f9425db551642778625ea9a4
diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk
index 07c0ed8..4226ebf 100644
--- a/descriptor-packages/mk/pkg.mk
+++ b/descriptor-packages/mk/pkg.mk
@@ -20,7 +20,7 @@
PKG_BASE_NAME := $(shell basename $(shell pwd))
PKG_NAME := $(addsuffix .tar.gz, $(PKG_BASE_NAME))
-CHARM_DIR := $(TOPDIR)/juju-charms
+CHARM_DIR := $(TOPDIR)/charms
CHARM_SRC_DIR := $(CHARM_DIR)/layers
CHARM_DOCKER_TAG := charm-tools
CHARM_BUILD_DIR := $(CHARM_DIR)/builds
@@ -69,14 +69,14 @@
$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
$(Q)charm build -o $(CHARM_DIR) $<
endif
-
+
clean:
$(Q)rm -rf $(BUILD_DIR)
$(Q)rm -rf $(CHARM_BUILD_DIR)
test:
- $(Q)echo -n testing $(shell readlink -f src/*.yaml) " "
+ $(Q)echo -n testing $(shell readlink -f src/*.yaml) " "
$(Q)$(TEST_PKG) src/*.yaml
$(Q)echo OK
-
+
.DEFAULT_GOAL := all