aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.ec2
diff options
context:
space:
mode:
authorMatt Macy <mmacy@FreeBSD.org>2018-07-22 23:20:24 +0000
committerMatt Macy <mmacy@FreeBSD.org>2018-07-22 23:20:24 +0000
commit16bb9a49ad6ce45b6f15cc03dff991231c02da49 (patch)
tree4bac204afbf2db14f98b159ffffe3ce074c88f54 /release/Makefile.ec2
parent87faf663183535257e6a36e68c7d3c607ac004f9 (diff)
downloadsrc-16bb9a49ad6ce45b6f15cc03dff991231c02da49.tar.gz
src-16bb9a49ad6ce45b6f15cc03dff991231c02da49.zip
Correctly reference SRCTOP, avoid multiple invocations of svn
Reported by: sjg
Notes
Notes: svn path=/head/; revision=336622
Diffstat (limited to 'release/Makefile.ec2')
-rw-r--r--release/Makefile.ec212
1 files changed, 9 insertions, 3 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 1a18229a7b0e..041e77651102 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -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