From 89a02c01d747bbf1d59eccf2de89f0da6c976672 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 17 May 2012 20:21:00 +0000
Subject: [PATCH] Fix &base; definition and add DOC_PREFIX_REL for autogen.ent.
Approved by: doceng (implicit)
---
share/mk/doc.common.mk | 7 +++++++
share/sgml/common.ent | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index 3404ab36f9..85a9093b6d 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -46,6 +46,13 @@ LANGCODE?= ${_LANGCODE}
# normalize DOC_PREFIX
DOC_PREFIX!= ${REALPATH} ${DOC_PREFIX}
+# Used for &base;
+.if ${LANGCODE} == "en_US.ISO8859-1"
+DOC_PREFIX_REL= ${.CURDIR:S,^${DOC_PREFIX},,:C,/[^/]+,/..,g:S,^/..,,:S,^/,,:S,^$,.,:S,^/..,,}
+.else
+DOC_PREFIX_REL= ${.CURDIR:S,^${DOC_PREFIX},,:C,/[^/]+,/..,g:S,^/..,,:S,^/,,:S,^$,.,}
+.endif
+
.if !defined(URL_RELPREFIX)
URLS_ABSOLUTE= YES
.elif !defined(URLS_ABSOLUTE)
diff --git a/share/sgml/common.ent b/share/sgml/common.ent
index 564524116f..bcfd19cf92 100644
--- a/share/sgml/common.ent
+++ b/share/sgml/common.ent
@@ -3,15 +3,15 @@
<!-- FreeBSD Common Entities -->
<!-- PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN" -->
+<!-- default value of &base; -->
+<!ENTITY base ".">
+
<!ENTITY % url.enbase.eq.base "IGNORE">
<![ %url.enbase.eq.base; [
<!ENTITY enbase "&base;">
]]>
<!ENTITY enbase "&base;/..">
-<!-- default value of &base; -->
-<!ENTITY base ".">
-
<!-- default langcode and encoding -->
<!ENTITY url.doc.langcode 'en_US.ISO8859-1'>
<!ENTITY xml.encoding 'iso-8859-1'>