Author: mmacy
Date: Sun Jul 22 23:20:24 2018
New Revision: 336622
URL: https://svnweb.freebsd.org/changeset/base/336622
Log:
Correctly reference SRCTOP, avoid multiple invocations of svn
Reported by: sjg
Modified:
head/release/Makefile.ec2
Modified: head/release/Makefile.ec2
==============================================================================
--- head/release/Makefile.ec2 Sun Jul 22 22:57:52 2018 (r336621)
+++ head/release/Makefile.ec2 Sun Jul 22 23:20:24 2018 (r336622)
@@ -15,9 +15,15 @@ SVN_CMD= ${_P}/${_S}
. endfor
. endfor
.endif
-.if exists($SRCTOP/.svn)
-EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} |
sed -e 's/\^\///'
-EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+.if exists(${SRCTOP}/.svn)
+. if empty(${EC2_SVNBRANCH})
+ EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} |
sed -e 's/\^\///'
+. export EC2_SVNBRANCH
+. endif
+. if empty(${EC2_SVNREV})
+ EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision
${WORLDDIR}
+. export EC2_SVNREV
+. endif
.else
EC2_SVNBRANCH= unknown
EC2_SVNREV= unknown
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
