svn commit: r52018 - in head/en_US.ISO8859-1/htdocs/releases/12.0R: . hardware

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}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"