From 7462d30d2f8d6c937c294b3a1b04f2251877cfbd Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Mon, 9 Aug 2004 16:22:55 +0000 Subject: [PATCH] - When /share/mk/doc.local.mk exists, it will be included just after doc.common.mk included. This can be used for various language specific customizations. - Remove SP_ENCODING_LIST. Translators should define the SP_ENCODING variable directly in their doc.local.mk when it is needed. Discussed with: den --- share/mk/doc.docbook.mk | 16 ++++------------ share/mk/doc.project.mk | 6 ++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index efee9ead19..9da710ea3c 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -147,7 +147,10 @@ NSGMLSWARNINGS= -wempty -wunclosed SX?= ${PREFIX}/bin/sx .endif -JADE_CMD= ${JADE} +.if defined(SP_ENCODING) +JADE_ENV+= SP_ENCODING=${SP_ENCODING} +.endif +JADE_CMD= ${SETENV} ${JADE_ENV} ${JADE} DSLHTML?= ${DOC_PREFIX}/share/sgml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/sgml/default.dsl @@ -452,17 +455,6 @@ CLEANFILES+= ${HTML_SPLIT_INDEX} ${HTML_INDEX} ${PRINT_INDEX} all: ${_docs} -# -# SP_ENCODING support -# -CUR_ENCODING!= ${ECHO} ${LANGCODE} | ${SED} 's/^.*\.//' | \ - ${SED} 's/^ISO/ISO\-/' -.for _sp_encoding in ${SP_ENCODING_LIST} -.if ${CUR_ENCODING} == ${_sp_encoding} -JADE_CMD= SP_ENCODING=${CUR_ENCODING} ${JADE} -.endif -.endfor - # XML -------------------------------------------------------------------- # sx generates a lot of (spurious) errors of the form "reference to diff --git a/share/mk/doc.project.mk b/share/mk/doc.project.mk index a9f4032397..5105173a9e 100644 --- a/share/mk/doc.project.mk +++ b/share/mk/doc.project.mk @@ -99,6 +99,12 @@ SETENV?= /usr/bin/env # targets and variables commonly used in doc/ and www/ tree. .include "doc.common.mk" +DOC_LOCAL_MK= ${DOC_PREFIX}/${LANGCODE}/share/mk/doc.local.mk + +.if exists(${DOC_LOCAL_MK}) +.include "${DOC_LOCAL_MK}" +.endif + # Ownership information. .include "doc.install.mk"