svn commit: r43913 - in projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases: . CURRENT CURRENT/errata CURRENT/hardware CURRENT/readme CURRENT/relnotes

[Glen Barber]

Author: gjb
Date: Thu Feb 13 23:21:17 2014
New Revision: 43913
URL: http://svnweb.freebsd.org/changeset/doc/43913

Log:
  Sigh.  Revert r43911,r43910
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata/
     - copied from r43909, projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata/
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme/
     - copied from r43909, projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme/
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes/
     - copied from r43909, projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes/
Deleted:
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/docbook.css
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes.xml
Modified:
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile.inc

Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile	Thu Feb 13 23:01:32 2014	(r43912)
+++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile	Thu Feb 13 23:21:17 2014	(r43913)
@@ -3,15 +3,18 @@
 DOC_PREFIX?=	${.CURDIR}/../../../..
 RELN_ROOT?=	${.CURDIR}/../../relnotes
 
+.if exists(${RELN_ROOT}/Makefile.inc)
+.include "${RELN_ROOT}/Makefile.inc"
+.endif
 .if exists(${.CURDIR}/Makefile.inc)
 .include "${.CURDIR}/Makefile.inc"
 .endif
 
-DOCS?=	errata.xml \
-	readme.xml \
-	relnotes.xml
+MAN4DIR?=	${DOC_PREFIX}/../src/share/man/man4
 
-#SUBDIR=	hardware
+SUBDIR=		errata \
+		hardware \
+		readme \
+		relnotes
 
-.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
-.include "${DOC_PREFIX}/share/mk/web.site.mk"
+.include "${DOC_PREFIX}/share/mk/doc.subdir.mk"

Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc	Thu Feb 13 23:01:32 2014	(r43912)
+++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc	Thu Feb 13 23:21:17 2014	(r43913)
@@ -1,10 +1,3 @@
 # $FreeBSD$
 
-.if exists(../Makefile.inc)
-.include "../Makefile.inc"
-.endif
-
 BRANCH?=	CURRENT
-WEBBASE?=	/data/releases
-DOC_PREFIX?=	${.CURDIR}/../../../..
-RELN_ROOT?=	${.CURDIR}/../../relnotes

Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile	Thu Feb 13 23:01:32 2014	(r43912)
+++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile	Thu Feb 13 23:21:17 2014	(r43913)
@@ -5,14 +5,14 @@ RELN_ROOT?=	${.CURDIR}/../../../relnotes
 
 DOC=		hardware
 
-.if exists(${.CURDIR}/../../../Makefile.inc)
-.include "${.CURDIR}/../../../Makefile.inc"
+.if exists(${RELN_ROOT}/Makefile.inc)
+.include "${RELN_ROOT}/Makefile.inc"
 .endif
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif
 
-#DESTDIR?=	${DOCDIR}/relnotes/${BRANCH}/${DOC}
+DESTDIR?=	${DOCDIR}/relnotes/${BRANCH}/${DOC}
 
 FORMATS?=	html
 INSTALL_COMPRESSED?=gz

Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile	Thu Feb 13 23:01:32 2014	(r43912)
+++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile	Thu Feb 13 23:21:17 2014	(r43913)
@@ -19,7 +19,6 @@ SUBDIR+=	7.0R 7.1R 7.2R 7.3R 7.4R
 SUBDIR+=	8.0R 8.1R 8.2R 8.3R 8.4R
 SUBDIR+=	9.0R 9.1R 9.2R
 SUBDIR+=	10.0R
-SUBDIR+=	CURRENT
 
 .if defined(NEW_BUILD)
 SUBDIR=

Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile.inc
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile.inc	Thu Feb 13 23:01:32 2014	(r43912)
+++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile.inc	Thu Feb 13 23:21:17 2014	(r43913)
@@ -2,4 +2,3 @@
 
 WEBBASE?=	/data/releases
 DOC_PREFIX?=	${.CURDIR}/../../../..
-RELN_ROOT?=	${.CURDIR}/../relnotes