aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-07-16 20:34:26 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-07-16 20:34:26 +0000
commit29b282f31d7388dfd9806fd1a0df8c37784482d8 (patch)
tree5468bf71e60dad060020474b6a4be5a1223fa4c8 /release/Makefile
parente2c0e292e8a7ca00ba99bcfccc9e637f45c3e8b1 (diff)
downloadsrc-29b282f31d7388dfd9806fd1a0df8c37784482d8.tar.gz
src-29b282f31d7388dfd9806fd1a0df8c37784482d8.zip
Makefile.inc1:
- New file. Adds logic to search for the git binary, as well as determining the branch and revision, used in various places. Makefile: - Remove searching for the svn{,lite} binary. Makefile.ec2: - Reduce duplicated code, removing searching for the svn{,lite} binary, in addition to EC2_SVN{BRANCH,REV}. - Rename EC2_SVN* with GIT* for consistency. Makefile.mirrors: - Remove the SRCBRANCH declaration, replaced with the exported GITBRANCH variable. - Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove the leading 'r' from it, since it will break git hashes. - Remove yet another instance of duplicated code to search for the svn{,version}lite binary. Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/projects/release-git/; revision=363258
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile11
1 files changed, 1 insertions, 10 deletions
diff --git a/release/Makefile b/release/Makefile
index 4c4c3de59267..2e828469ed21 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -90,15 +90,6 @@ EXTRA_PACKAGES+= src.txz
.endif
.if !defined(NODOC)
EXTRA_PACKAGES+= reldoc
-. if !defined(SVN) || empty(SVN)
-. for S in svn svnlite
-. for D in /usr/local/bin /usr/bin
-. if(exists(${D}/${S}))
-SVN?= ${D}/${S}
-. endif
-. endfor
-. endfor
-. endif
.endif
RELEASE_TARGETS= ftp
@@ -173,7 +164,6 @@ ports.txz:
reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \
- SVN=${SVN} \
_BRANCH=${BRANCH} \
${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
@@ -336,4 +326,5 @@ release-install:
cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
+.include "${.CURDIR}/Makefile.inc1"
.include "${.CURDIR}/Makefile.vm"