makefile fix

Signed-off-by: Lou Marvin Caraig <loumarvincaraig@gmail.com>

Makefile

@@ -18,6 +18,7 @@ $(MAKEFILE):
 GOTEST_INTEGRATION = $(GOTEST) -parallel 1 -count 1 -tags=integration -ldflags "$(LD_FLAGS)"
 
 OS := $(shell uname)
+CURRENT_BUILD_PATH := $(BUILD_PATH)
 PREV_BUILD_PATH := build-prev
 NEXT_BUILD_PATH := build-next
 
@@ -39,18 +40,29 @@ integration-build-previous: integration-clean-previous integration-prepare-build
 	git checkout -q $(CURRENT_VERSION)
 	echo "Built version $(PREV_VERSION)"
 
-integration-clean-current:
+integration-clean-next:
 	rm -rf $(NEXT_BUILD_PATH)
 	$(GOCLEAN) .
-integration-prepare-build-current:
+integration-prepare-build-next:
 	git checkout -q $(NEXT_VERSION)
 	$(eval BUILD_PATH = $(NEXT_BUILD_PATH))
-integration-build-current: integration-clean-current integration-prepare-build-current build docker-build
+integration-build-next: integration-clean-next integration-prepare-build-next build docker-build
 	git checkout -q $(CURRENT_VERSION)
 	echo "Built version $(NEXT_VERSION)"
 
+integration-clean-current:
+	rm -rf $(CURRENT_BUILD_PATH)
+	$(GOCLEAN) .
+integration-prepare-build-current:
+	git checkout -q $(CURRENT_VERSION)
+	$(eval BUILD_PATH = $(CURRENT_BUILD_PATH))
+integration-build-current: integration-clean-current integration-prepare-build-current build docker-build
+	git checkout -q $(CURRENT_VERSION)
+	echo "Built version $(CURRENT_VERSION)"
+
 integration-build-all:
 	$(MAKE) integration-build-current
+	$(MAKE) integration-build-next
 	$(MAKE) integration-build-previous
 
 ifeq ($(OS),Darwin)