d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build non-svn checkouts post r336593

Browse Source 
The change made in r336593 assumes that the build is happening in a
svn checkout resulting in misleading debug output. Check that we're
actually working in an svn checkout before proceeding to call svn.
This commit is contained in:
mmacy 2018-07-22 22:57:52 +00:00
parent 1ed3bffbe6
commit f254afe46d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/Makefile.ec2
View File

@ -15,8 +15,13 @@ SVN_CMD= ${_P}/${_S}
. endfor . endfor
. endfor . endfor
.endif .endif
.if exists($SRCTOP/.svn)
EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
.else
EC2_SVNBRANCH= unknown
EC2_SVNREV= unknown
.endif
.if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
AMINAMESUFFIX!= date +-%Y-%m-%d AMINAMESUFFIX!= date +-%Y-%m-%d