From 5350ccb9b2dbb73c6a15f1c002d1e16a8e202cd1 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 11 May 2004 10:35:19 +0000
Subject: [PATCH] Unbreak the build.  The current URLS_ENT cannot support
 .OBJDIR when .CURDIR is not under DOC_PREFIX.  This is a band-aid measure but
 I will fix this soon.

Pointy hat to:	hrs
---
 share/mk/doc.common.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index bed2402d45..96a7e4e90f 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -7,6 +7,7 @@
 
 AWK?=		/usr/bin/awk
 GREP?=		/usr/bin/grep
+REALPATH?=	/bin/realpath
 
 .if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
 WEB_PREFIX?=	${DOC_PREFIX}/../www
@@ -24,14 +25,14 @@ DOC_PREFIX?=	${WEB_PREFIX}/../doc
 #
 
 .if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
-DOC_PREFIX_NAME!=	realpath ${DOC_PREFIX}
+DOC_PREFIX_NAME!=	${REALPATH} ${DOC_PREFIX}
 DOC_PREFIX_NAME:=	${DOC_PREFIX_NAME:T}
 .else
 DOC_PREFIX_NAME?=	doc
 .endif
 
 .if defined(WEB_PREFIX) && !empty(WEB_PREFIX)
-WWW_PREFIX_NAME!=	realpath ${WEB_PREFIX}
+WWW_PREFIX_NAME!=	${REALPATH} ${WEB_PREFIX}
 WWW_PREFIX_NAME:=	${WWW_PREFIX_NAME:T}
 .else
 WWW_PREFIX_NAME?=	www
@@ -101,6 +102,10 @@ _WWW_LANGCODE:= ${_WWW2_LANGCODE}
 .endif
 WWW_LANGCODE?=	${_WWW_LANGCODE}
 
+# normalize DOC_PREFIX and WEB_PREFIX
+DOC_PREFIX!=	${REALPATH} ${DOC_PREFIX}
+WEB_PREFIX!=	${REALPATH} ${WEB_PREFIX}
+
 # ------------------------------------------------------------------------
 #
 # mirrors.xml dependency.
@@ -163,7 +168,9 @@ CLEANFILES+= ${XML_MIRRORS}.sort.tmp
 # urls.ent dependency.
 #
 
-URLS_ENT=	${.OBJDIR}/${DOC_PREFIX:S,^${.CURDIR}/,,}/share/sgml/urls.ent
+# XXX: .OBJDIR does not work.
+#URLS_ENT=	${.OBJDIR}/${DOC_PREFIX:S,^${.CURDIR}/,,}/share/sgml/urls.ent
+URLS_ENT=	${DOC_PREFIX}/share/sgml/urls.ent
 
 ${URLS_ENT}:
 .if !defined(URLS_ABSOLUTE)