From 60df387cac68d22c4cce8f476548c4809b476307 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 27 Feb 2018 12:40:10 +0100
Subject: [PATCH] make: retain upgrade clean without clobbering package build

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0e3623740..dff500fbc 100644
--- a/Makefile
+++ b/Makefile
@@ -265,7 +265,7 @@ upgrade-check:
 		exit 1; \
 	fi
 
-upgrade: plist-check upgrade-check package
+upgrade: plist-check upgrade-check clean-package package
 	@${PKG} delete -fy ${CORE_NAME}
 	@${PKG} add ${PKGDIR}/*.txz
 	@/usr/local/etc/rc.restart_webgui
@@ -334,6 +334,9 @@ test: want-phpunit6
 	@cd ${.CURDIR}/src/opnsense/mvc/tests && \
 	    phpunit --configuration PHPunit.xml
 
+clean-package:
+	@rm -rf ${PKGDIR}
+
 clean-src:
 	@${GIT} reset -q ${.CURDIR}/src && \
 	    ${GIT} checkout -f ${.CURDIR}/src && \
@@ -342,6 +345,6 @@ clean-src:
 clean-work:
 	@rm -rf ${WRKSRC}
 
-clean: clean-src clean-work
+clean: clean-package clean-src clean-work
 
 .PHONY: license plist