Merge ~ballot/charm-k8s-telegraf/+git/charm-k8s-telegraf:func_tests into ~sajoupa/charm-k8s-telegraf:func_tests

[Benjamin Allot]

diff --git a/Makefile b/Makefile
index f3816ce..8cf5c6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION_TO_BUILD ?= latest
 
-PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
+PROJECTPATH=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 CHARM_BUILD_DIR ?= ${PROJECTPATH}
 METADATA_FILE="metadata.yaml"
 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | awk '/^name:/ {print $$2".charm"}')
@@ -20,9 +20,9 @@ unittests:
 	@tox -e unit
 
 build:
-	@echo "Building charm to ${CHARM_BUILD_DIR}${CHARM_NAME}"
+	@echo "Building charm to ${CHARM_BUILD_DIR}/${CHARM_NAME}"
 	@-git rev-parse HEAD > ./repo-info
-	@TERM=linux charmcraft build -f .
+	@cd ${CHARM_BUILD_DIR} && TERM=linux charmcraft build -f ${PROJECTPATH}
 
 test: lint unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
diff --git a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
index 3513a62..d19c84a 100644
--- a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   {{ charm_name }}:
-    charm: "{{ CHARM_BUILD_DIR }}{{ charm_name }}.charm"
+    charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}.charm"