git: d0f4b71cc053 - main - Makefile.inc1: minor style changes

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=d0f4b71cc053c3d28870c1bf47c4f1d2c7d49d3a

commit d0f4b71cc053c3d28870c1bf47c4f1d2c7d49d3a
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2024-10-04 22:35:08 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-06-13 01:21:44 +0000

    Makefile.inc1: minor style changes
    
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1445
---
 Makefile.inc1 | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index e56c40c114fc..50efeecd5def 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1999,8 +1999,8 @@ PKG_EXT=	${PKG_FORMAT}
 PKG_EXT=	pkg
 .endif
 
-.if !defined(PKG_VERSION_FROM) && make(real-update-packages)
-.if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest)
+.if !defined(PKG_VERSION_FROM) && make(real-update-packages) && \
+    exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest)
 PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest
 PKG_VERSION_FROM_DIR=	${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM}
 # Determine the name of the branch base on the version
@@ -2023,11 +2023,6 @@ BRANCH_EXT_FROM=	rc
 .elif ${PKG_VERSION_FROM:M*.a*}
 BRANCH_EXT_FROM=	alpha
 .endif
-.else
-PKG_VERSION_FROM=
-PKG_VERSION_FROM_DIR=
-BRANCH_EXT_FROM=
-.endif
 .endif
 
 PKGMAKEARGS+=	PKG_VERSION=${PKG_VERSION} \
@@ -2051,9 +2046,7 @@ real-packages:	stage-packages create-packages sign-packages .PHONY
 
 real-update-packages: stage-packages .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} create-packages
-.if empty(PKG_VERSION_FROM_DIR)
-	@echo "==> Bootstrapping repository, not checking for new packages"
-.else
+.if defined(PKG_VERSION_FROM_DIR)
 	@echo "==> Checking for new packages (comparing ${PKG_VERSION} to ${PKG_VERSION_FROM})"
 	@for pkg in ${PKG_VERSION_FROM_DIR}/${PKG_NAME_PREFIX}-*; do \
 	  pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \
@@ -2071,9 +2064,10 @@ real-update-packages: stage-packages .PHONY
 	    echo "==> New package $${newpkgname}" ; \
 	  fi ; \
 	done
+.else
+	@echo "==> Bootstrapping repository, not checking for new packages"
 .endif
-	${_+_}@cd ${.CURDIR}; \
-		${MAKE} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} sign-packages
+	${_+_}${MAKE} -C ${.CURDIR} -f Makefile.inc1 PKG_VERSION=${PKG_VERSION} sign-packages
 
 stage-packages-world: .PHONY
 	@mkdir -p ${WSTAGEDIR}