diff --git a/da_DK.ISO8859-1/htdocs/doc/Makefile b/da_DK.ISO8859-1/htdocs/doc/Makefile
index 7523074d73..96f02c6250 100644
--- a/da_DK.ISO8859-1/htdocs/doc/Makefile
+++ b/da_DK.ISO8859-1/htdocs/doc/Makefile
@@ -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}
diff --git a/de_DE.ISO8859-1/htdocs/doc/Makefile b/de_DE.ISO8859-1/htdocs/doc/Makefile
index 258ae643e8..96f02c6250 100644
--- a/de_DE.ISO8859-1/htdocs/doc/Makefile
+++ b/de_DE.ISO8859-1/htdocs/doc/Makefile
@@ -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
diff --git a/el_GR.ISO8859-7/htdocs/doc/Makefile b/el_GR.ISO8859-7/htdocs/doc/Makefile
index 010cd81d7c..96f02c6250 100644
--- a/el_GR.ISO8859-7/htdocs/doc/Makefile
+++ b/el_GR.ISO8859-7/htdocs/doc/Makefile
@@ -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
diff --git a/es_ES.ISO8859-1/htdocs/doc/Makefile b/es_ES.ISO8859-1/htdocs/doc/Makefile
index 282af948ef..96f02c6250 100644
--- a/es_ES.ISO8859-1/htdocs/doc/Makefile
+++ b/es_ES.ISO8859-1/htdocs/doc/Makefile
@@ -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}
diff --git a/fr_FR.ISO8859-1/htdocs/doc/Makefile b/fr_FR.ISO8859-1/htdocs/doc/Makefile
index 870db36a52..96f02c6250 100644
--- a/fr_FR.ISO8859-1/htdocs/doc/Makefile
+++ b/fr_FR.ISO8859-1/htdocs/doc/Makefile
@@ -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
-all-pgpkeyring:
- @unset DESTDIR || true; \
- cd ${DOC_PREFIX}/share/pgpkeys; \
- ${MAKE} \
- pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+ ${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= ${.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
+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/fr_FR.ISO8859-1; \
+ cd ${DOC_PREFIX}/${LANGCODE}; \
${MAKE} ${.TARGET}
diff --git a/hu_HU.ISO8859-2/htdocs/doc/Makefile b/hu_HU.ISO8859-2/htdocs/doc/Makefile
index e2be37d551..96f02c6250 100644
--- a/hu_HU.ISO8859-2/htdocs/doc/Makefile
+++ b/hu_HU.ISO8859-2/htdocs/doc/Makefile
@@ -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
diff --git a/it_IT.ISO8859-15/htdocs/doc/Makefile b/it_IT.ISO8859-15/htdocs/doc/Makefile
index 35094533bd..96f02c6250 100644
--- a/it_IT.ISO8859-15/htdocs/doc/Makefile
+++ b/it_IT.ISO8859-15/htdocs/doc/Makefile
@@ -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
diff --git a/ja_JP.eucJP/htdocs/doc/Makefile b/ja_JP.eucJP/htdocs/doc/Makefile
index f27ff28bb0..96f02c6250 100644
--- a/ja_JP.eucJP/htdocs/doc/Makefile
+++ b/ja_JP.eucJP/htdocs/doc/Makefile
@@ -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
diff --git a/mn_MN.UTF-8/htdocs/doc/Makefile b/mn_MN.UTF-8/htdocs/doc/Makefile
index b2b24997da..96f02c6250 100644
--- a/mn_MN.UTF-8/htdocs/doc/Makefile
+++ b/mn_MN.UTF-8/htdocs/doc/Makefile
@@ -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
diff --git a/nl_NL.ISO8859-1/htdocs/doc/Makefile b/nl_NL.ISO8859-1/htdocs/doc/Makefile
index fd05bafde7..96f02c6250 100644
--- a/nl_NL.ISO8859-1/htdocs/doc/Makefile
+++ b/nl_NL.ISO8859-1/htdocs/doc/Makefile
@@ -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
diff --git a/pt_BR.ISO8859-1/htdocs/doc/Makefile b/pt_BR.ISO8859-1/htdocs/doc/Makefile
index d4f60401f2..96f02c6250 100644
--- a/pt_BR.ISO8859-1/htdocs/doc/Makefile
+++ b/pt_BR.ISO8859-1/htdocs/doc/Makefile
@@ -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
diff --git a/ru_RU.KOI8-R/htdocs/doc/Makefile b/ru_RU.KOI8-R/htdocs/doc/Makefile
index 344138eefa..96f02c6250 100644
--- a/ru_RU.KOI8-R/htdocs/doc/Makefile
+++ b/ru_RU.KOI8-R/htdocs/doc/Makefile
@@ -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
-all-pgpkeyring:
- @unset DESTDIR || true; \
- cd ${DOC_PREFIX}/share/pgpkeys; \
- ${MAKE} \
- pgpkeyring > ${.OBJDIR}/pgpkeyring.txt
+ ${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= ${.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
+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
diff --git a/tr_TR.ISO8859-9/htdocs/doc/Makefile b/tr_TR.ISO8859-9/htdocs/doc/Makefile
index f75c6d9e40..96f02c6250 100644
--- a/tr_TR.ISO8859-9/htdocs/doc/Makefile
+++ b/tr_TR.ISO8859-9/htdocs/doc/Makefile
@@ -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
diff --git a/zh_CN.UTF-8/htdocs/doc/Makefile b/zh_CN.UTF-8/htdocs/doc/Makefile
index f003fb8c70..96f02c6250 100644
--- a/zh_CN.UTF-8/htdocs/doc/Makefile
+++ b/zh_CN.UTF-8/htdocs/doc/Makefile
@@ -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 zh_CN*
-.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
diff --git a/zh_TW.UTF-8/htdocs/doc/Makefile b/zh_TW.UTF-8/htdocs/doc/Makefile
index 8f4b942277..96f02c6250 100644
--- a/zh_TW.UTF-8/htdocs/doc/Makefile
+++ b/zh_TW.UTF-8/htdocs/doc/Makefile
@@ -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 zh_TW*
-.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