svn commit: r329679 - head

[Bryan Drewery]

Author: bdrewery
Date: Tue Feb 20 22:03:08 2018
New Revision: 329679
URL: https://svnweb.freebsd.org/changeset/base/329679

Log:
  Properly lookup values if they were empty.
  
  Spotted by:	rpokala
  X-MFC-With:	r329676
  MFC after:	2 weeks
  Sponsored by:	Dell EMC

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Feb 20 22:03:04 2018	(r329678)
+++ head/Makefile.inc1	Tue Feb 20 22:03:08 2018	(r329679)
@@ -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