D27643.id81924.diff
No OneTemporary
Actions

Size

715 B

Referenced Files

None

Subscribers

None

D27643.id81924.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -540,14 +540,12 @@
	.endif

	# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
	-.if !defined(_REVISION)
	-_REVISION!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION
	-.export _REVISION
	-.endif
	-.if !defined(_BRANCH)
	-_BRANCH!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH
	-.export _BRANCH
	+.for _V in BRANCH REVISION
	+.if !defined(_${_V})
	+_${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V}
	+.export _${_V}
	.endif
	+.endfor
	.if !defined(SRCRELDATE)
	SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
	${SRCDIR}/sys/sys/param.h