From c0927e1c29ab4084c7b58408269bc9e9c5e640d2 Mon Sep 17 00:00:00 2001
From: Hao Liu <haoli@redhat.com>
Date: Mon, 27 Feb 2023 20:49:39 -0500
Subject: [PATCH] update makefiles

---
 Makefile             | 8 ++++----
 awx/ui_next/Makefile | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index dfb3225321..149f9718b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-include awx/ui_next/Makefile
+-include awx/ui_next/Makefile
 
 PYTHON ?= python3.9
 OFFICIAL ?= no
@@ -387,7 +387,7 @@ bulk_data:
 # UI TASKS
 # --------------------------------------
 
-UI_BUILD_FLAG_FILE = $(CURDIR)/ui/.ui-built
+UI_BUILD_FLAG_FILE = awx/ui/.ui-built
 
 clean-ui:
 	rm -rf node_modules
@@ -448,7 +448,7 @@ HEADLESS ?= no
 ifeq ($(HEADLESS), yes)
 dist/$(SDIST_TAR_FILE):
 else
-dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) awx/ui_next/src/build
+dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) awx/ui_next/build
 endif
 	$(PYTHON) -m build -s
 	ln -sf $(SDIST_TAR_FILE) dist/awx.tar.gz
@@ -590,7 +590,7 @@ awx-kube-dev-build: Dockerfile.kube-dev
 	    -t $(DEV_DOCKER_TAG_BASE)/awx_kube_devel:$(COMPOSE_TAG) .
 
 ## Build awx image for deployment on Kubernetes environment.
-awx-kube-build: Dockerfile
+awx-kube-build: Dockerfile awx/ui_next/src
 	DOCKER_BUILDKIT=1 docker build -f Dockerfile \
 		--build-arg VERSION=$(VERSION) \
 		--build-arg SETUPTOOLS_SCM_PRETEND_VERSION=$(VERSION) \
diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile
index b6fb1b70d5..2056536812 100644
--- a/awx/ui_next/Makefile
+++ b/awx/ui_next/Makefile
@@ -79,6 +79,6 @@ ui_next/clean: ui_next/clean/build
 .PHONY: ui_next/clean/build
 ## Clean ui_next build
 ui_next/clean/build:
-	rm -rf $$(UI_NEXT_DIR)/build
+	rm -rf $(UI_NEXT_DIR)/build