os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move code specific to hardware.html to Makefile.hardware.

Browse source 
Including Makefile.inc in Makefile causes the installation
path for the top-level index.html and schedule.html pages
to be nested within another DESTDIR.  This commit fixes
that problem.

Reported by:	Sebastian Huber (via hackers@)
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2018-07-18 14:51:05 +00:00
parent 8869ebb2bf
commit 334fe0290b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=52018
4 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
en_US.ISO8859-1/htdocs/releases/12.0R/Makefile
View file

@ -6,8 +6,8 @@
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
.if exists(Makefile.inc)
.include "Makefile.inc"
.if exists(Makefile.hardware)
.include "Makefile.hardware"
.endif
RELN_ROOT?= ${.CURDIR}

18
en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware Normal file
View file

@ -0,0 +1,18 @@
# $FreeBSD$
.include "${DOC_PREFIX}/share/mk/doc.commands.mk"
_OS?= FreeBSD
_REVMAJOR?= 12
_REVMINOR?= 0
_REVISION?= ${REVMAJOR}.${REVMINOR}
_BRANCH?= CURRENT
THISRELEASE?= ${_OS}-${_REVISION}-${_BRANCH}
HOSTNAME!= hostname
.if (${_BRANCH:MCURRENT*} != "" || ${_BRANCH:MALPHA*} != "")
SRCBRANCH= head
.elif (${_BRANCH:MPRERELEASE} != "" || ${_BRANCH:MBETA*} != "" || ${_BRANCH:MSTABLE*} != "")
SRCBRANCH= stable/${_REVMAJOR}
.elif (${_BRANCH:MRC*} != "" || ${_BRANCH:MRELEASE*} != "")
SRCBRANCH= releng/${_REVMAJOR}.${_REVMINOR}
.endif

17
en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc
View file

@ -10,20 +10,3 @@ DESTDIR= ${HOME}/public_html/${WEBDIR}
.endif
DOCBOOK_DEPS_DISABLE= YES
.endif
.include "${DOC_PREFIX}/share/mk/doc.commands.mk"
_OS?= FreeBSD
_REVMAJOR?= 12
_REVMINOR?= 0
_REVISION?= ${REVMAJOR}.${REVMINOR}
_BRANCH?= CURRENT
THISRELEASE?= ${_OS}-${_REVISION}-${_BRANCH}
HOSTNAME!= hostname
.if (${_BRANCH:MCURRENT*} != "" || ${_BRANCH:MALPHA*} != "")
SRCBRANCH= head
.elif (${_BRANCH:MPRERELEASE} != "" || ${_BRANCH:MBETA*} != "" || ${_BRANCH:MSTABLE*} != "")
SRCBRANCH= stable/${_REVMAJOR}
.elif (${_BRANCH:MRC*} != "" || ${_BRANCH:MRELEASE*} != "")
SRCBRANCH= releng/${_REVMAJOR}.${_REVMINOR}
.endif

3
en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile
View file

@ -3,6 +3,9 @@
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
.if exists(../Makefile.hardware)
.include "../Makefile.hardware"
.endif
MAN4TMP!= ${MKTEMP} -d ${.CURDIR}/svn.XXXXXXXX
MAN4DIR= ${MAN4TMP}