Author: gjb
Date: Thu Oct 4 01:46:56 2018
New Revision: 339175
URL: https://svnweb.freebsd.org/changeset/base/339175
Log:
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
Modified:
head/release/Makefile
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Wed Oct 3 20:39:48 2018 (r339174)
+++ head/release/Makefile Thu Oct 4 01:46:56 2018 (r339175)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
