From a612457c4abeaa083be0361c984e3171aa5015cf Mon Sep 17 00:00:00 2001 From: Hao Liu Date: Mon, 6 Mar 2023 17:19:01 -0500 Subject: [PATCH] fix some bug --- awx/ui_next/Makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile index 1afb19f521..83ddd078ec 100644 --- a/awx/ui_next/Makefile +++ b/awx/ui_next/Makefile @@ -1,8 +1,9 @@ UI_NEXT_MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) -UI_NEXT_DIR := $(subst $(CURDIR)/,, $(UI_NEXT_MKFILE_PATH)) +UI_NEXT_MKFILE_DIR := $(dir $(UI_NEXT_MKFILE_PATH)) +UI_NEXT_DIR := $(subst $(CURDIR)/,, $(UI_NEXT_MKFILE_DIR)) -UI_NEXT_SRC_DIR := $(UI_NEXT_DIR)/src -UI_NEXT_BUILD_DIR := $(UI_NEXT_DIR)/build +UI_NEXT_SRC_DIR := $(UI_NEXT_DIR)src +UI_NEXT_BUILD_DIR := $(UI_NEXT_DIR)build # Path to your local clone of the UI_NEXT repo UI_NEXT_LOCAL ?= @@ -75,14 +76,25 @@ ui_next/build: ui_next/src/build $(UI_NEXT_BUILD_DIR): $(MAKE) ui_next/build +## Alias for ui_next/clean +$(UI_NEXT_DIR)clean: + rm -rf $(UI_NEXT_DIR)/src + rm -rf $(UI_NEXT_DIR)/build + .PHONY: ui_next/clean ## Clean ui_next ui_next/clean: ui_next/clean/build - rm -rf $(UI_NEXT_SRC_DIR) + rm -rf $(UI_NEXT_DIR)/src + +.PHONY: ui_next/clean/src +## Clean ui_next src +ui_next/clean/src: + rm -rf $(UI_NEXT_DIR)/src .PHONY: ui_next/clean/build ## Clean ui_next build ui_next/clean/build: - rm -rf $(UI_NEXT_BUILD_DIR) - + rm -rf $(UI_NEXT_DIR)/build +print-%: + @echo $($*) \ No newline at end of file