git: 106951f09fe3 - main - Makefile.inc1: Add back missing if
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 05 Oct 2025 15:14:50 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=106951f09fe39dc693fd7130ab4bc751e1438631
commit 106951f09fe39dc693fd7130ab4bc751e1438631
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-10-05 15:11:29 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-10-05 15:11:29 +0000
Makefile.inc1: Add back missing if
The .if defined(_MKSHOWCONFIG) covered an unusually large area, so it
should have not been removed in the last commit. I must have tested in
the wrong tree before pushing...
FixeS: 28b858f5059c
Sponsored by: Netflix
---
Makefile.inc1 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Makefile.inc1 b/Makefile.inc1
index e508ffa88d4b..6ace6a6b5eaf 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -522,6 +522,8 @@ BUILDENV_SHELL?=${SHELL}
BUILDENV_SHELL?=/bin/sh
.endif
+.if !defined(_MKSHOWCONFIG)
+
.if !defined(GIT_CMD) || empty(GIT_CMD)
. for _P in /usr/bin /usr/local/bin
. if exists(${_P}/git)
@@ -582,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/}
.if !defined(PKG_VERSION)
PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
.endif
+
.endif # !defined(_MKSHOWCONFIG)
.if make(*package*)