From owner-svn-doc-all@freebsd.org Wed Jul 18 14:51:06 2018 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6E12104D0AB; Wed, 18 Jul 2018 14:51:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7DD8C7D7C4; Wed, 18 Jul 2018 14:51:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6033B1BB91; Wed, 18 Jul 2018 14:51:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6IEp6bW026275; Wed, 18 Jul 2018 14:51:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6IEp52U026272; Wed, 18 Jul 2018 14:51:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201807181451.w6IEp52U026272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 18 Jul 2018 14:51:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r52018 - in head/en_US.ISO8859-1/htdocs/releases/12.0R: . hardware X-SVN-Group: doc-head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head/en_US.ISO8859-1/htdocs/releases/12.0R: . hardware X-SVN-Commit-Revision: 52018 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2018 14:51:06 -0000 Author: gjb Date: Wed Jul 18 14:51:05 2018 New Revision: 52018 URL: https://svnweb.freebsd.org/changeset/doc/52018 Log: Move code specific to hardware.html to Makefile.hardware. 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 Added: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware (contents, props changed) Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile Wed Jul 18 14:40:37 2018 (r52017) +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile Wed Jul 18 14:51:05 2018 (r52018) @@ -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} Added: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.hardware Wed Jul 18 14:51:05 2018 (r52018) @@ -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 Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc Wed Jul 18 14:40:37 2018 (r52017) +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc Wed Jul 18 14:51:05 2018 (r52018) @@ -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 Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile Wed Jul 18 14:40:37 2018 (r52017) +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile Wed Jul 18 14:51:05 2018 (r52018) @@ -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}