From a13b50e98b347b62fd28f09bf77adb35886a1321 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 7 Jul 2004 11:23:16 +0000
Subject: [PATCH] Unbreak the build.

Pointy hat to:	hrs
---
 en_US.ISO8859-1/books/handbook/Makefile | 2 +-
 share/mk/doc.common.mk                  | 1 +
 share/sgml/urls.ent                     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile
index 8c074385d8..61fc071f37 100644
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@@ -205,7 +205,7 @@ book.pdf: book.ps
 	${PS2PDF} book.ps book.pdf
 
 pgpkeyring: pgpkeys/chapter.sgml
-	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
+	@${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC}
 
 #
 # Handbook-specific variables
diff --git a/share/mk/doc.common.mk b/share/mk/doc.common.mk
index ca041be4fc..abffbd61e7 100644
--- a/share/mk/doc.common.mk
+++ b/share/mk/doc.common.mk
@@ -188,6 +188,7 @@ NSGMLSFLAGS+=	-i${URL_RELPREFIX_ENT}
 # for ascii and printable format, always use URLS_ABSOLUTE.
 PRINTFLAGS+=	-ifreebsd.urls.absolute
 HTMLTXTFLAGS+=	-ifreebsd.urls.absolute
+OTHERFLAGS+=	-ifreebsd.urls.absolute
 
 # for packages, always use URLS_ABSOLUTE.
 PKGMAKEFLAGS+=	URLS_ABSOLUTE=yes
diff --git a/share/sgml/urls.ent b/share/sgml/urls.ent
index 7aec0b33d5..4932a5cca1 100644
--- a/share/sgml/urls.ent
+++ b/share/sgml/urls.ent
@@ -49,4 +49,4 @@
 <!-- put relative urls here -->
 
 <!ENTITY url.main "&url.relprefix;">
-<!ENTITY url.base "../../../..">
+<!ENTITY url.base "&url.relprefix;">