Date: Tue, 20 Feb 2018 22:03:08 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329679 - head Message-ID: <201802202203.w1KM38NJ003813@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802202203.w1KM38NJ003813>