d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the hardware.{txt,html} build in the release/Makefile 'reldoc'

Browse Source 
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
This commit is contained in:
Glen Barber 2018-10-04 01:46:56 +00:00
parent 23f2e22802
commit 8046db8b49
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/Makefile
View File

@ -90,6 +90,15 @@ EXTRA_PACKAGES+= src.txz
.endif .endif
.if !defined(NODOC) .if !defined(NODOC)
EXTRA_PACKAGES+= reldoc 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 .endif
RELEASE_TARGETS= ftp RELEASE_TARGETS= ftp
@ -164,6 +173,7 @@ ports.txz:
reldoc: reldoc:
cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \ cd ${DOCDIR}/en_US.ISO8859-1/htdocs/releases/${REVISION}R && \
env MAN4DIR=${WORLDDIR}/share/man/man4 \ env MAN4DIR=${WORLDDIR}/share/man/man4 \
SVN=${SVN} \
${MAKE} all install clean "FORMATS=html txt" \ ${MAKE} all install clean "FORMATS=html txt" \
INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \ INSTALL_COMPRESSED='' URLS_ABSOLUTE=YES DOCDIR=${.OBJDIR}/rdoc \
WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc WEBDIR=${DOCDIR} DESTDIR=${.OBJDIR}/rdoc