diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2018-10-04 01:46:56 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2018-10-04 01:46:56 +0000 |
| commit | 8046db8b49bf5cdf54b8f17867a8bdb294100bd8 (patch) | |
| tree | 48604dcc298c58b4f65ff9ff72c5ef2b4d6a6c39 /release/Makefile | |
| parent | 23f2e22802fcf2ec666a31c5727004107b596bd3 (diff) | |
| download | src-8046db8b49bf5cdf54b8f17867a8bdb294100bd8.tar.gz src-8046db8b49bf5cdf54b8f17867a8bdb294100bd8.zip | |
Fix the hardware.{txt,html} build in the release/Makefile 'reldoc'
target.
The doc/share/mk/doc.commands.mk sets SVN to /usr/local/bin/svn
by default, which is not necessarily installed by the documentation
project textproc/docproj port.
Ensure SVN can be evaluated properly to include the hardware pages
by iterating through /usr/local/bin and /usr/bin and looking for
both svn and svnlite binaries, and pass the SVN variable explicitly
through env(1) in the reldoc target to avoid failures if it does not
exist.
Approved by: re (rgrimes)
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=339175
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/release/Makefile b/release/Makefile index 79d53b4cbb61..6eddf11d7231 100644 --- a/release/Makefile +++ b/release/Makefile @@ -90,6 +90,15 @@ 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 @@ -164,6 +173,7 @@ ports.txz: reldoc: cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \ env MAN4DIR=${WORLDDIR}/share/man/man4 \ + SVN=${SVN} \ ${MAKE} all install clean "FORMATS=html txt" \ INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \ WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc |