From 47f0d10114de8d56d22fa4edb6f7c7ea57cd7fe1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 30 Jul 2025 09:54:30 +0200
Subject: [PATCH] make: MFCDIR changes

Provide the work directory variables for standalone use.
---
 Mk/common.mk  |  5 +++++
 Mk/plugins.mk | 12 +++---------
 Mk/style.mk   |  2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Mk/common.mk b/Mk/common.mk
index bfd8be9ff..d0919334f 100644
--- a/Mk/common.mk
+++ b/Mk/common.mk
@@ -23,4 +23,9 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
+WRKDIR?=${.CURDIR}/work
+WRKSRC?=${WRKDIR}/src
+PKGDIR?=${WRKDIR}/pkg
+MFCDIR?=/tmp/mfc.dir
+
 .-include "${PLUGINSDIR}/../core/Mk/common.mk"
diff --git a/Mk/plugins.mk b/Mk/plugins.mk
index e640b074b..246a62613 100644
--- a/Mk/plugins.mk
+++ b/Mk/plugins.mk
@@ -305,13 +305,6 @@ remove: check
 		fi; \
 	done
 
-WRKDIR?=${.CURDIR}/work
-WRKSRC?=${WRKDIR}/src
-PKGDIR?=${WRKDIR}/pkg
-
-ensure-workdirs:
-	@mkdir -p ${WRKSRC} ${PKGDIR}
-
 package: check
 	@rm -rf ${WRKSRC}
 	@mkdir -p ${WRKSRC} ${PKGDIR}
@@ -367,8 +360,9 @@ test: check
 		    ${.CURDIR}/src/opnsense/mvc/tests; \
 	fi
 
-commit: ensure-workdirs
+commit:
+	@mkdir -p ${MFCDIR}
 	@/bin/echo -n "${.CURDIR:C/\// /g:[-2]}/${.CURDIR:C/\// /g:[-1]}: " > \
-	    ${WRKDIR}/.commitmsg && git commit -eF ${WRKDIR}/.commitmsg .
+	    ${MFCDIR}/.commitmsg && git commit -eF ${MFCDIR}/.commitmsg .
 
 .PHONY:	check
diff --git a/Mk/style.mk b/Mk/style.mk
index 3168f94a8..e9dcc839f 100644
--- a/Mk/style.mk
+++ b/Mk/style.mk
@@ -26,5 +26,3 @@
 CORE_PYTHON_DOT=${PLUGIN_PYTHON:C/./&./1}
 
 .-include "${PLUGINSDIR}/../core/Mk/style.mk"
-
-style-php: ensure-workdirs