The new Makefile framework. Does the right thing (pretty much) except

in the case of */FAQ/Makefile, because the FAQs are all in the wrong
place.  Things still install properly, but some of the directory paths
are hardcoded.  This will be going away ASAP.

Makefile

@@ -1,26 +1,10 @@
-# $Id: Makefile,v 1.9 1999-03-27 15:56:08 nik Exp $
+# $Id: Makefile,v 1.10 1999-08-16 22:09:03 nik Exp $
 
-SUBDIR=	FAQ 
+SUBDIR =	FAQ 
-
+SUBDIR+=	en_US.ISO_8859-1
-# List of all language-specific subdirs.
+SUBDIR+=	es_ES.ISO_8859-1
-LANGSUBDIR=     en es ja ru zh
+SUBDIR+=	ja_JP.eucJP
-
+SUBDIR+=	ru_SU.KOI8-R
-# If ALLLANG is defined, descend to all language-specific subdirs too.
+SUBDIR+=	zh_TW.Big5
-# If ALLLANG is not defined, but DOC_LANG is defined and a subdirectory with
-# that name exists, descend to that directory too.
-# In either case, the default subdirectories are always traversed.
-
-.if defined(ALLLANG)
-SUBDIR+=	${LANGSUBDIR}
-.elif defined(DOC_LANG)
-.if exists(${.CURDIR}/${DOC_LANG})
-SUBDIR+=	${DOC_LANG}
-.endif
-.endif
-
-# Default output formats are ascii for troff documents, and 
-# ascii and html for sgml documents.  
-# To specify generate postscript versions of troff documents, use: 
-#  make PRINTER=ps
 
 .include <bsd.subdir.mk>

en_US.ISO8859-1/Makefile

@@ -1,5 +1,20 @@
-#       $Id: Makefile,v 1.1 1999-03-08 21:43:32 nik Exp $
+#       $Id: Makefile,v 1.2 1999-08-16 22:09:04 nik Exp $
 
-SUBDIR = handbook
+SUBDIR = articles
+SUBDIR+= books
+
+COMPAT_SYMLINK = en
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/en_US.ISO_8859-1		\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
 
 .include <bsd.subdir.mk>

en_US.ISO8859-1/articles/Makefile

@@ -0,0 +1,11 @@
+#       $Id: Makefile,v 1.1 1999-08-16 22:09:19 nik Exp $
+
+SUBDIR = diskless-x
+SUBDIR+= fonts
+SUBDIR+= formatting-media
+SUBDIR+= mh
+SUBDIR+= multi-os
+SUBDIR+= new-users
+SUBDIR+= programming-tools
+
+.include <bsd.subdir.mk>

en_US.ISO8859-1/articles/Makefile.inc

@@ -0,0 +1,5 @@
+# 
+# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:19 nik Exp $
+#
+
+DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/articles/${.CURDIR:T}

en_US.ISO8859-1/articles/fonts/Makefile

@@ -1,6 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:13 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:06 nik Exp $
 
-DOCS=	fonts.docb
+DOC?= article
-INDEXLINK=	fonts.html
 
-.include "../../web.mk"
+FORMATS?= html
+
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/articles/formatting-media/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.1 1997-09-13 04:24:23 jfieber Exp $
+# $Id: Makefile,v 1.2 1999-08-16 22:09:06 nik Exp $
 
-DOCS=	diskformat.docb
+DOC?= article
-INDEXLINK=	diskformat.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/articles/mh/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:13 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:07 nik Exp $
 
-DOCS=	mh.docb
+DOC?= article
-INDEXLINK=	mh.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/articles/multi-os/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:14 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:08 nik Exp $
 
-DOCS=	multios.docb
+DOC?= article
-INDEXLINK=	multios.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/articles/new-users/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.3 1997-07-01 05:38:15 max Exp $
+# $Id: Makefile,v 1.4 1999-08-16 22:09:09 nik Exp $
 
-DOCS=	newuser.docb
+DOC?= article
-INDEXLINK=	newuser.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/articles/programming-tools/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:11 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:10 nik Exp $
 
-DOCS=	devel.docb
+DOC?= article
-INDEXLINK=	devel.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO8859-1/books/Makefile

@@ -0,0 +1,6 @@
+#       $Id: Makefile,v 1.1 1999-08-16 22:09:05 nik Exp $
+
+SUBDIR = fdp-primer
+SUBDIR+= handbook
+
+.include <bsd.subdir.mk>

en_US.ISO8859-1/books/Makefile.inc

@@ -0,0 +1,5 @@
+# 
+# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:05 nik Exp $
+#
+
+DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/books/${.CURDIR:T}

en_US.ISO_8859-1/Makefile

@@ -1,5 +1,20 @@
-#       $Id: Makefile,v 1.1 1999-03-08 21:43:32 nik Exp $
+#       $Id: Makefile,v 1.2 1999-08-16 22:09:04 nik Exp $
 
-SUBDIR = handbook
+SUBDIR = articles
+SUBDIR+= books
+
+COMPAT_SYMLINK = en
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/en_US.ISO_8859-1		\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
 
 .include <bsd.subdir.mk>

en_US.ISO_8859-1/articles/Makefile

@@ -0,0 +1,11 @@
+#       $Id: Makefile,v 1.1 1999-08-16 22:09:19 nik Exp $
+
+SUBDIR = diskless-x
+SUBDIR+= fonts
+SUBDIR+= formatting-media
+SUBDIR+= mh
+SUBDIR+= multi-os
+SUBDIR+= new-users
+SUBDIR+= programming-tools
+
+.include <bsd.subdir.mk>

en_US.ISO_8859-1/articles/Makefile.inc

@@ -0,0 +1,5 @@
+# 
+# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:19 nik Exp $
+#
+
+DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/articles/${.CURDIR:T}

en_US.ISO_8859-1/articles/fonts/Makefile

@@ -1,6 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:13 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:06 nik Exp $
 
-DOCS=	fonts.docb
+DOC?= article
-INDEXLINK=	fonts.html
 
-.include "../../web.mk"
+FORMATS?= html
+
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/articles/formatting-media/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.1 1997-09-13 04:24:23 jfieber Exp $
+# $Id: Makefile,v 1.2 1999-08-16 22:09:06 nik Exp $
 
-DOCS=	diskformat.docb
+DOC?= article
-INDEXLINK=	diskformat.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/articles/mh/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:13 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:07 nik Exp $
 
-DOCS=	mh.docb
+DOC?= article
-INDEXLINK=	mh.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/articles/multi-os/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:14 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:08 nik Exp $
 
-DOCS=	multios.docb
+DOC?= article
-INDEXLINK=	multios.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/articles/new-users/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.3 1997-07-01 05:38:15 max Exp $
+# $Id: Makefile,v 1.4 1999-08-16 22:09:09 nik Exp $
 
-DOCS=	newuser.docb
+DOC?= article
-INDEXLINK=	newuser.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/articles/programming-tools/Makefile

@@ -1,7 +1,14 @@
-# $Id: Makefile,v 1.4 1997-07-01 05:38:11 max Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:10 nik Exp $
 
-DOCS=	devel.docb
+DOC?= article
-INDEXLINK=	devel.html
 
-.include "../../web.mk"
+FORMATS?= html
 
+INSTALL_COMPRESSED?=gz
+INSTALL_ONLY_COMPRESSED?=
+
+SRCS= article.sgml
+
+DOC_PREFIX?= ../../..
+
+.include "../../../share/mk/docproj.docbook.mk"

en_US.ISO_8859-1/books/Makefile

@@ -0,0 +1,6 @@
+#       $Id: Makefile,v 1.1 1999-08-16 22:09:05 nik Exp $
+
+SUBDIR = fdp-primer
+SUBDIR+= handbook
+
+.include <bsd.subdir.mk>

en_US.ISO_8859-1/books/Makefile.inc

@@ -0,0 +1,5 @@
+# 
+# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:05 nik Exp $
+#
+
+DESTDIR?=	${DOC_INSTALL_PREFIX}/en_US.ISO_8859-1/books/${.CURDIR:T}

es_ES.ISO8859-1/FAQ/Makefile

@@ -1,9 +1,10 @@
-# $Id: Makefile,v 1.4 1998-12-09 00:32:19 nik Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:14 nik Exp $
 
 .NOTPARALLEL: 
 
 DOC=    FAQ
-DOCDIR= ${SHAREDIR}/doc/es
+VOLUME=	faq
+DOCDIR= /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books
 FORMATS?= html roff
 SGMLOPTS+=-links
 

es_ES.ISO8859-1/Makefile

@@ -1,6 +1,26 @@
-#       From: @(#)Makefile      8.1 (Berkeley) 6/5/93
+#       $Id: Makefile,v 1.2 1999-08-16 22:09:13 nik Exp $
-#       $Id: Makefile,v 1.1 1998-07-20 17:16:21 nik Exp $
 
 SUBDIR = FAQ
 
+COMPAT_SYMLINK = es
+
+# 
+# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
+# when the FAQ is DocBook'ed
+beforeinstall:
+	[ -d /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq ] || \
+		mkdir -p /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/es_ES.ISO_8859-1		\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
+
 .include <bsd.subdir.mk>

es_ES.ISO_8859-1/FAQ/Makefile

@@ -1,9 +1,10 @@
-# $Id: Makefile,v 1.4 1998-12-09 00:32:19 nik Exp $
+# $Id: Makefile,v 1.5 1999-08-16 22:09:14 nik Exp $
 
 .NOTPARALLEL: 
 
 DOC=    FAQ
-DOCDIR= ${SHAREDIR}/doc/es
+VOLUME=	faq
+DOCDIR= /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books
 FORMATS?= html roff
 SGMLOPTS+=-links
 

es_ES.ISO_8859-1/Makefile

@@ -1,6 +1,26 @@
-#       From: @(#)Makefile      8.1 (Berkeley) 6/5/93
+#       $Id: Makefile,v 1.2 1999-08-16 22:09:13 nik Exp $
-#       $Id: Makefile,v 1.1 1998-07-20 17:16:21 nik Exp $
 
 SUBDIR = FAQ
 
+COMPAT_SYMLINK = es
+
+# 
+# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
+# when the FAQ is DocBook'ed
+beforeinstall:
+	[ -d /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq ] || \
+		mkdir -p /usr/local/share/doc/fdp/es_ES.ISO_8859-1/books/faq
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/es_ES.ISO_8859-1		\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
+
 .include <bsd.subdir.mk>

ja_JP.eucJP/FAQ/Makefile

@@ -1,11 +1,12 @@
-# $Id: Makefile,v 1.6 1998-07-24 05:31:24 hanai Exp $
+# $Id: Makefile,v 1.7 1999-08-16 22:09:13 nik Exp $
 # Original revision: 1.7
 # The FreeBSD Japanese Documentation Project
 
 .NOTPARALLEL:
 
 DOC=    FAQ
-DOCDIR= ${SHAREDIR}/doc/ja
+VOLUME=	faq
+DOCDIR= /usr/local/share/doc/fdp/ja/books
 FORMATS?= html roff
 SGMLOPTS+=-e EUC-JP
 SGMLOPTS+=-links

ja_JP.eucJP/Makefile

@@ -1,8 +1,26 @@
-#       From: @(#)Makefile      8.1 (Berkeley) 6/5/93
+#       $Id: Makefile,v 1.6 1999-08-16 22:09:11 nik Exp $
-#       $Id: Makefile,v 1.5 1998-02-25 04:32:56 hanai Exp $
 
-SUBDIR = handbook
+SUBDIR = books
-SUBDIR+= FAQ
 SUBDIR+= man
+SUBDIR+= FAQ
+
+COMPAT_SYMLINK = ja_JP.eucJP
+
+# XXX Kludge -- pull this out when the FAQ is in DocBook
+beforeinstall:
+	[ -d /usr/local/share/doc/fdp/ja/books/faq ] || \
+		mkdir -p /usr/local/share/doc/fdp/ja/books/faq
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/ja			\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
 
 .include <bsd.subdir.mk>

ja_JP.eucJP/books/Makefile

@@ -0,0 +1,5 @@
+#       $Id: Makefile,v 1.1 1999-08-16 22:09:20 nik Exp $
+
+SUBDIR = handbook
+
+.include <bsd.subdir.mk>

ja_JP.eucJP/books/Makefile.inc

@@ -0,0 +1,5 @@
+# 
+# $Id: Makefile.inc,v 1.1 1999-08-16 22:09:20 nik Exp $
+#
+
+DESTDIR?=	${DOC_INSTALL_PREFIX}/ja/books/${.CURDIR:T}

ja_JP.eucJP/books/handbook/Makefile

@@ -1,5 +1,5 @@
 # 
-# $Id: Makefile,v 1.34 1999-05-06 17:44:14 motoyuki Exp $
+# $Id: Makefile,v 1.35 1999-08-16 22:09:12 nik Exp $
 #
 # Build the FreeBSD Handbook (Japanese).
 #
@@ -11,7 +11,7 @@ MAINTAINER=kuriyama@FreeBSD.ORG
 JADEOPTS=	-ilang.ja
 TIDYFLAGS=	-raw
 
-DOC?= handbook
+DOC?= book
 
 FORMATS?= html-split
 
@@ -24,7 +24,7 @@ INSTALL_ONLY_COMPRESSED?=
 #
 
 # SGML content
-SRCS=  handbook.sgml
+SRCS=  book.sgml
 SRCS+= advanced-networking/chapter.sgml
 SRCS+= backups/chapter.sgml
 SRCS+= basics/chapter.sgml
@@ -64,4 +64,5 @@ SRCS+= mailing-lists.ent
 SRCS+=	jcontrib/chapter.sgml
 SRCS+=	jauthors.ent
 
-.include "../../share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ../../..
+.include "../../../share/mk/docproj.docbook.mk"

ru_RU.KOI8-R/FAQ/Makefile

@@ -1,9 +1,10 @@
-# $Id: Makefile,v 1.2 1998-12-30 10:17:35 dt Exp $
+# $Id: Makefile,v 1.3 1999-08-16 22:09:17 nik Exp $
 
 .NOTPARALLEL:
 
 DOC=	FAQ
-DOCDIR=	${SHAREDIR}/doc/ru
+VOLUME=	faq
+DOCDIR=	/usr/local/share/doc/fdp/ru_SU.KOI8-R/books
 FORMATS?= html roff
 SGMLOPTS+=-e koi8-r
 SGMLOPTS+=-links

ru_RU.KOI8-R/Makefile

@@ -1,6 +1,26 @@
-#       From: @(#)Makefile      8.1 (Berkeley) 6/5/93
+#       $Id: Makefile,v 1.2 1999-08-16 22:09:16 nik Exp $
-#       $Id: Makefile,v 1.1 1998-12-28 19:19:56 ache Exp $
 
 SUBDIR = FAQ
 
+COMPAT_SYMLINK = ru
+
+# 
+# XXX Kludge -- this directory probably doesn't exist yet.  Pull this out 
+# when the FAQ is DocBook'ed
+beforeinstall:
+	[ -d /usr/local/share/doc/fdp/ru_SU.KOI8-R/books/faq ] || \
+		mkdir -p /usr/local/share/doc/fdp/ru_SU.KOI8-R/books/faq
+
+#
+# Put the compatability symlink in place.
+#
+afterinstall:
+.if !defined(IGNORE_COMPAT_SYMLINK)
+	if [ ! -e /usr/local/share/doc/fdp/${COMPAT_SYMLINK} ]; then	\
+		rm -rf /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+		ln -s /usr/local/share/doc/fdp/ru_SU.KOI8-R	\
+		      /usr/local/share/doc/fdp/${COMPAT_SYMLINK};	\
+	fi
+.endif
+
 .include <bsd.subdir.mk>

share/sgml/catalog

@@ -1,7 +1,7 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $Id: catalog,v 1.4 1999-06-03 19:35:48 nik Exp $
+  -- $Id: catalog,v 1.5 1999-08-16 22:09:18 nik Exp $
   --
 
   -- ...................................................................... --
@@ -29,7 +29,7 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
   --
 
 PUBLIC 	"-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN" 
-	"../../en/share/sgml/bookinfo.ent"
+	"../../en_US.ISO_8859-1/share/sgml/bookinfo.ent"
 
   -- A hypothetical French version of the BookInfo FPI would look like
      "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"