X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptor-packages%2Fmk%2Fpkg.mk;h=4226ebfcf80417554519bc0d68723961608e1854;hb=84fe31f632166d2fbf566968bd25aa9545e96fdc;hp=07c0ed88c8b33d8cd2c5cb1c02fb4c20a6424def;hpb=04976e09a7b76cade784d74d8e06ee909bc22f17;p=osm%2Fdevops.git diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk index 07c0ed88..4226ebfc 100644 --- a/descriptor-packages/mk/pkg.mk +++ b/descriptor-packages/mk/pkg.mk @@ -20,7 +20,7 @@ TOOLS_DIR := $(TOPDIR)/descriptor-packages/tools 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 @@ else $(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