From 9aabba2665f0e58df97d4fbf85d1b5a1b29a2e29 Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Wed, 11 Mar 2020 19:56:45 +0530 Subject: [PATCH] Makefile: Fix distclean make target The default install directory is not being removed correctly by distclean make target due to recent changes. This patch fixes distclean make target to fix default install directory removal. Fixes: 82ae8e8fe2a3 ("makefile: Do setup of the install target more flexible") Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 58a2807..fe44ceb 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,11 @@ endif ifeq ($(build_dir),$(CURDIR)) $(error Build directory is same as source directory.) endif +install_root_dir_default=$(CURDIR)/install ifdef I install_root_dir=$(shell $(READLINK) -f $(I)) else - install_root_dir=$(CURDIR)/install/usr + install_root_dir=$(install_root_dir_default)/usr endif ifeq ($(install_root_dir),$(CURDIR)) $(error Install root directory is same as source directory.) @@ -456,7 +457,7 @@ ifeq ($(build_dir),$(CURDIR)/build) $(if $(V), @echo " RM $(build_dir)") $(CMD_PREFIX)rm -rf $(build_dir) endif -ifeq ($(install_root_dir),$(CURDIR)/install) - $(if $(V), @echo " RM $(install_root_dir)") - $(CMD_PREFIX)rm -rf $(install_root_dir) +ifeq ($(install_root_dir),$(install_root_dir_default)/usr) + $(if $(V), @echo " RM $(install_root_dir_default)") + $(CMD_PREFIX)rm -rf $(install_root_dir_default) endif