From 55927f28365234d3036aa585e168824dca30d750 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 20 Feb 2018 22:03:08 +0000
Subject: [PATCH] Properly lookup values if they were empty.

Spotted by:	rpokala
X-MFC-With:	r329676
MFC after:	2 weeks
Sponsored by:	Dell EMC
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2cf796ec22af..0c44743f5c18 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -350,8 +350,8 @@ SVN_CMD=   ${_P}/${_S}
 .export SVN_CMD
 .endif
 SVNFLAGS?=	-r HEAD
-.if !defined(VCS_REVISION) && empty(VCS_REVISION)
-.if !defined(SVNVERSION_CMD) && empty(SVNVERSION_CMD)
+.if !defined(VCS_REVISION) || empty(VCS_REVISION)
+.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD)
 . for _D in ${PATH:S,:, ,g}
 .  if exists(${_D}/svnversion)
 SVNVERSION_CMD?=${_D}/svnversion