Date: Thu, 13 Feb 2014 21:58:54 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r43906 - in projects/relnotes-restructure/en_US.ISO8859-1/htdocs: releases/CURRENT releases/CURRENT/errata releases/CURRENT/hardware releases/CURRENT/readme releases/CURRENT/relnotes re... Message-ID: <201402132158.s1DLwsTL078549@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Feb 13 21:58:54 2014 New Revision: 43906 URL: http://svnweb.freebsd.org/changeset/doc/43906 Log: Move relnotes/11.0R to releases/CURRENT. Fix 'install' target. Sponsored by: The FreeBSD Foundation Added: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/ - copied from r43905, projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc Deleted: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/ Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme/Makefile projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes/Makefile Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/Makefile Thu Feb 13 21:03:02 2014 (r43905) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile Thu Feb 13 21:58:54 2014 (r43906) @@ -1,7 +1,14 @@ # $FreeBSD$ DOC_PREFIX?= ${.CURDIR}/../../../.. -RELN_ROOT?= ${.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 MAN4DIR?= ${DOC_PREFIX}/../src/share/man/man4 Added: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/Makefile.inc Thu Feb 13 21:58:54 2014 (r43906) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +BRANCH?= CURRENT Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata/Makefile ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/errata/Makefile Thu Feb 13 21:03:02 2014 (r43905) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/errata/Makefile Thu Feb 13 21:58:54 2014 (r43906) @@ -1,15 +1,18 @@ # $FreeBSD$ DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/../.. +RELN_ROOT?= ${.CURDIR}/../../../relnotes DOC= errata -.ifdef NO_LANGCODE_IN_DESTDIR -DESTDIR?= ${DOCDIR}/${DOC} -.else -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/${DOC} +.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} FORMATS?= html INSTALL_COMPRESSED?=gz Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/hardware/Makefile Thu Feb 13 21:03:02 2014 (r43905) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/hardware/Makefile Thu Feb 13 21:58:54 2014 (r43906) @@ -1,15 +1,18 @@ # $FreeBSD$ DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/../.. +RELN_ROOT?= ${.CURDIR}/../../../relnotes DOC= hardware -.ifdef NO_LANGCODE_IN_DESTDIR -DESTDIR?= ${DOCDIR}/${DOC} -.else -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/${DOC} +.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} FORMATS?= html INSTALL_COMPRESSED?=gz Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme/Makefile ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/readme/Makefile Thu Feb 13 21:03:02 2014 (r43905) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/readme/Makefile Thu Feb 13 21:58:54 2014 (r43906) @@ -1,15 +1,18 @@ # $FreeBSD$ DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/../.. +RELN_ROOT?= ${.CURDIR}/../../../relnotes DOC= readme -.ifdef NO_LANGCODE_IN_DESTDIR -DESTDIR?= ${DOCDIR}/${DOC} -.else -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/${DOC} +.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} FORMATS?= html INSTALL_COMPRESSED?=gz Modified: projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes/Makefile ============================================================================== --- projects/relnotes-restructure/en_US.ISO8859-1/htdocs/relnotes/11.0R/relnotes/Makefile Thu Feb 13 21:03:02 2014 (r43905) +++ projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/CURRENT/relnotes/Makefile Thu Feb 13 21:58:54 2014 (r43906) @@ -1,15 +1,18 @@ # $FreeBSD$ DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/../.. +RELN_ROOT?= ${.CURDIR}/../../../relnotes DOC= relnotes -.ifdef NO_LANGCODE_IN_DESTDIR -DESTDIR?= ${DOCDIR}/${DOC} -.else -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/${DOC} +.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} FORMATS?= html INSTALL_COMPRESSED?=gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402132158.s1DLwsTL078549>