From owner-svn-doc-all@freebsd.org Sat Oct 7 11:25:09 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47FBFE35ECD; Sat, 7 Oct 2017 11:25:09 +0000 (UTC) (envelope-from wosch@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 mx1.freebsd.org (Postfix) with ESMTPS id F159A849; Sat, 7 Oct 2017 11:25:08 +0000 (UTC) (envelope-from wosch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v97BP8SL035497; Sat, 7 Oct 2017 11:25:08 GMT (envelope-from wosch@FreeBSD.org) Received: (from wosch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v97BP618035480; Sat, 7 Oct 2017 11:25:06 GMT (envelope-from wosch@FreeBSD.org) Message-Id: <201710071125.v97BP618035480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wosch set sender to wosch@FreeBSD.org using -f From: Wolfram Schneider Date: Sat, 7 Oct 2017 11:25:06 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51078 - in head: da_DK.ISO8859-1/htdocs/doc de_DE.ISO8859-1/htdocs/doc el_GR.ISO8859-7/htdocs/doc es_ES.ISO8859-1/htdocs/doc fr_FR.ISO8859-1/htdocs/doc hu_HU.ISO8859-2/htdocs/doc it_IT... X-SVN-Group: doc-head X-SVN-Commit-Author: wosch X-SVN-Commit-Paths: in head: da_DK.ISO8859-1/htdocs/doc de_DE.ISO8859-1/htdocs/doc el_GR.ISO8859-7/htdocs/doc es_ES.ISO8859-1/htdocs/doc fr_FR.ISO8859-1/htdocs/doc hu_HU.ISO8859-2/htdocs/doc it_IT.ISO8859-15/htdocs/doc j... X-SVN-Commit-Revision: 51078 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.23 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: Sat, 07 Oct 2017 11:25:09 -0000 Author: wosch Date: Sat Oct 7 11:25:06 2017 New Revision: 51078 URL: https://svnweb.freebsd.org/changeset/doc/51078 Log: sync from English Makefile, r51076 PR: 222828 Modified: head/da_DK.ISO8859-1/htdocs/doc/Makefile head/de_DE.ISO8859-1/htdocs/doc/Makefile head/el_GR.ISO8859-7/htdocs/doc/Makefile head/es_ES.ISO8859-1/htdocs/doc/Makefile head/fr_FR.ISO8859-1/htdocs/doc/Makefile head/hu_HU.ISO8859-2/htdocs/doc/Makefile head/it_IT.ISO8859-15/htdocs/doc/Makefile head/ja_JP.eucJP/htdocs/doc/Makefile head/mn_MN.UTF-8/htdocs/doc/Makefile head/nl_NL.ISO8859-1/htdocs/doc/Makefile head/pt_BR.ISO8859-1/htdocs/doc/Makefile head/ru_RU.KOI8-R/htdocs/doc/Makefile head/tr_TR.ISO8859-9/htdocs/doc/Makefile head/zh_CN.UTF-8/htdocs/doc/Makefile head/zh_TW.UTF-8/htdocs/doc/Makefile Modified: head/da_DK.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/da_DK.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/da_DK.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,43 +1,47 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + +.if exists(../Makefile.conf) +.include "../Makefile.conf" +.endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/da_DK.ISO8859-1; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/da_DK.ISO8859-1; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/da_DK.ISO8859-1; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf da* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE @unset DESTDIR || true; \ - cd ${.CURDIR}/../../../doc/da_DK.ISO8859-1; \ + cd ${DOC_PREFIX}/${LANGCODE}; \ ${MAKE} ${.TARGET} Modified: head/de_DE.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/de_DE.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/de_DE.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,15 +1,10 @@ # # $FreeBSD$ -# $FreeBSDde$ -# basiert auf: r44174 # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -17,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf de* handbook faq -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/el_GR.ISO8859-7/htdocs/doc/Makefile ============================================================================== --- head/el_GR.ISO8859-7/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/el_GR.ISO8859-7/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,22 +1,10 @@ # # $FreeBSD$ # -# -# The FreeBSD Greek Documentation Project -# -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# -# This file should be placed in the www/el/doc directory -# (which should be created) -# -# %SOURCE% en/doc/Makefile -# %SRCID% 1.1 -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -24,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf el* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/es_ES.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/es_ES.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/es_ES.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,13 +1,10 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -15,35 +12,36 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean -.if make(clean) - ${RM} -rf es* -.endif +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE @unset DESTDIR || true; \ - cd ${.CURDIR}/../../../doc/es_ES.ISO8859-1; \ + cd ${DOC_PREFIX}/${LANGCODE}; \ ${MAKE} ${.TARGET} Modified: head/fr_FR.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/fr_FR.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/fr_FR.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,64 +1,47 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# -# The FreeBSD French Documentation Project -# Original revision: 1.8 - -.if exists(Makefile.conf) -.include "Makefile.conf" +.if exists(../Makefile.conf) +.include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -# all: all-all all-install all-pgpkeyring -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all + all-pgpkeyring: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/share/pgpkeys; \ - ${MAKE} \ - pgpkeyring > ${.OBJDIR}/pgpkeyring.txt + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -# .if make(install) -# @unset DESTDIR || true; \ -# cd ${.CURDIR}/../../../doc/fr_FR.ISO8859-1/books/handbook; \ -# ${MAKE} \ -# pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt -# .endif -.if make(clean) -# ${RM} -rf fr* handbook faq pgpkeyring.txt - ${RM} -rf fr* -.endif +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE @unset DESTDIR || true; \ - cd ${.CURDIR}/../../../doc/fr_FR.ISO8859-1; \ + cd ${DOC_PREFIX}/${LANGCODE}; \ ${MAKE} ${.TARGET} Modified: head/hu_HU.ISO8859-2/htdocs/doc/Makefile ============================================================================== --- head/hu_HU.ISO8859-2/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/hu_HU.ISO8859-2/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,13 +1,10 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -15,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf hu* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/it_IT.ISO8859-15/htdocs/doc/Makefile ============================================================================== --- head/it_IT.ISO8859-15/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/it_IT.ISO8859-15/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,43 +1,44 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# -.if exists(Makefile.conf) -.include "Makefile.conf" + +.if exists(../Makefile.conf) +.include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf it* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/ja_JP.eucJP/htdocs/doc/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/ja_JP.eucJP/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,6 +1,5 @@ # # $FreeBSD$ -# Original revision: r40713 # # Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. @@ -13,30 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= NO_JPMAN= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= NO_JPMAN= install + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= NO_JPMAN= ${.TARGET} -.if make(clean) - ${RM} -rf ja* -.endif +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/mn_MN.UTF-8/htdocs/doc/Makefile ============================================================================== --- head/mn_MN.UTF-8/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/mn_MN.UTF-8/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,13 +1,10 @@ # # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -15,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf mn* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/nl_NL.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/nl_NL.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/nl_NL.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,14 +1,10 @@ # # $FreeBSD$ -# Original revision: 1.8 # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -16,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf nl* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/pt_BR.ISO8859-1/htdocs/doc/Makefile ============================================================================== --- head/pt_BR.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/pt_BR.ISO8859-1/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,17 +1,10 @@ -# The FreeBSD Documentation Project -# The FreeBSD Brazilian Portuguese Documentation Project # -# Original version: 1.8 -# # $FreeBSD$ # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -19,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf pt* faq -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/ru_RU.KOI8-R/htdocs/doc/Makefile ============================================================================== --- head/ru_RU.KOI8-R/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/ru_RU.KOI8-R/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,62 +1,44 @@ # -# The FreeBSD Russian Documentation Project -# # $FreeBSD$ -# $FreeBSDru: frdp/www/ru/doc/Makefile,v 1.2 2004/01/03 04:36:26 andy Exp $ # -# Original revision: 1.8 +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it +# in to the right place as necessary. # -.if exists(Makefile.conf) -.include "Makefile.conf" + +.if exists(../Makefile.conf) +.include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -# -# Build the FreeBSD documentation *outside* of the www tree, and install it -# in to the right place as necessary. -# -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# -#all: all-all all-install all-pgpkeyring -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all + all-pgpkeyring: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/share/pgpkeys; \ - ${MAKE} \ - pgpkeyring > ${.OBJDIR}/pgpkeyring.txt + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -#.if make(install) -# @unset DESTDIR || true; \ -# cd ${DOC_PREFIX}/${LANGCODE}/books/handbook; \ -# ${MAKE} \ -# pgpkeyring > ${DESTDIR}/data/doc/pgpkeyring.txt -#.endif -.if make(clean) - ${RM} -rf ru* handbook faq -.endif +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/tr_TR.ISO8859-9/htdocs/doc/Makefile ============================================================================== --- head/tr_TR.ISO8859-9/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/tr_TR.ISO8859-9/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,16 +1,10 @@ # -# The FreeBSD Documentation Project -# The FreeBSD Turkish Documentation Project# # $FreeBSD$ -# Based on: 1.8 # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -18,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + all-all: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" \ - INSTALL_COMPRESSED= all -all-install: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${.OBJDIR} \ - INSTALL_COMPRESSED= install -install clean: - @unset DESTDIR || true; \ - cd ${DOC_PREFIX}/${LANGCODE}; \ - ${MAKE} FORMATS="html-split html" DOCDIR=${DESTDIR}/data/doc \ - INSTALL_COMPRESSED= ${.TARGET} -.if make(clean) - ${RM} -rf tr* -.endif + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" all +all-pgpkeyring: + ${MAKE} -C ${DOC_PREFIX}/share/pgpkeys pgpkeyring.txt + +clean: + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc clean + +# here are dragons +install: + unset DESTDIR || true; \ + ${MAKE} -C ${DOC_PREFIX}/${LANGCODE} FORMATS="${_DOC_FORMATS}" DOCDIR=${DESTDIR}/data/doc install + ${CP} ${DOC_PREFIX}/share/pgpkeys/pgpkeyring.txt ${DESTDIR}/data/doc/pgpkeyring.txt + .include "${DOC_PREFIX}/share/mk/web.site.mk" +.if ${LANGCODE} == en_US.ISO8859-1 +all: all-pgpkeyring +.endif + +# XXX obj: _OBJUSE _OBJUSE: .USE Modified: head/zh_CN.UTF-8/htdocs/doc/Makefile ============================================================================== --- head/zh_CN.UTF-8/htdocs/doc/Makefile Sat Oct 7 10:35:00 2017 (r51077) +++ head/zh_CN.UTF-8/htdocs/doc/Makefile Sat Oct 7 11:25:06 2017 (r51078) @@ -1,14 +1,10 @@ # # $FreeBSD$ -# Original revision: 1.8 # -# Build the FreeBSD documentation *outside* of the www tree, and install it +# Build the FreeBSD documentation *outside* of the doc/ tree, and install it # in to the right place as necessary. # -# This assumes that you have the www/ and doc/ trees checked out beside -# one another -- this was always the case anyway, so there are no extra -# requirements here. -# + .if exists(../Makefile.conf) .include "../Makefile.conf" .endif @@ -16,29 +12,33 @@ .include "../Makefile.inc" .endif -all: all-all all-install +_DOC_FORMATS?= html-split html +all: all-all + + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***