From nbm@rucus.ru.ac.za Tue Aug 24 01:40:16 1999
Return-Path: <nbm@rucus.ru.ac.za>
Received: from rucus.ru.ac.za (rucus.ru.ac.za [146.231.29.2])
	by hub.freebsd.org (Postfix) with SMTP id 49F40150B7
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Aug 1999 01:40:09 -0700 (PDT)
	(envelope-from nbm@rucus.ru.ac.za)
Received: (qmail 80609 invoked by uid 1003); 24 Aug 1999 08:41:01 -0000
Message-Id: <19990824084101.80608.qmail@rucus.ru.ac.za>
Date: 24 Aug 1999 08:41:01 -0000
From: nbm@rucus.ru.ac.za
Reply-To: nbm@rucus.ru.ac.za
To: FreeBSD-gnats-submit@freebsd.org
Subject: obj-related DOC_PREFIX? changes
X-Send-Pr-Version: 3.2

>Number:         13345
>Category:       docs
>Synopsis:       obj-related DOC_PREFIX? changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 24 01:50:01 PDT 1999
>Closed-Date:    Sun Oct 3 20:37:16 PDT 1999
>Last-Modified:  Sun Oct  3 20:38:37 PDT 1999
>Originator:     Neil Blakey-Milner
>Release:        FreeBSD 3.0-STABLE i386
>Organization:
Rhodes University Computer Users' Society
>Environment:

FreeBSD rucus.ru.ac.za 3.0-STABLE FreeBSD 3.0-STABLE #0: Tue Feb  9 22:52:23 GMT 1999     grahams@rucus.ru.ac.za:/usr/src/sys/compile/RUCUS-SMP  i386

>Description:

These are pretty arbitrary preliminary changes to make obj'able doc
builds possible.  The real stuff depends on this.  It applies to all
languages.  It doesn't cover the tutorials, as they're governed by
web.mk (and that's a whole other story)

>How-To-Repeat:

Try build docs when the obj dir exists.

>Fix:
Index: en_US.ISO_8859-1/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1999/08/19 20:35:53	1.3
+++ Makefile	1999/08/23 09:30:36
@@ -19,5 +19,5 @@
 
 .include <bsd.subdir.mk>
 
-DOC_PREFIX?= ..
+DOC_PREFIX?= ${.CURDIR}/..
 .include "../share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/diskless-x/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/diskless-x/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1999/08/17 21:35:52	1.2
+++ Makefile	1999/08/23 12:20:07
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/fonts/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/fonts/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1999/08/16 22:09:06	1.5
+++ Makefile	1999/08/23 12:20:24
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/formatting-media/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/formatting-media/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	1999/08/16 22:09:06	1.2
+++ Makefile	1999/08/23 12:20:40
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/mh/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/mh/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1999/08/16 22:09:07	1.5
+++ Makefile	1999/08/23 12:17:14
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/multi-os/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/multi-os/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1999/08/16 22:09:08	1.5
+++ Makefile	1999/08/23 12:18:58
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/new-users/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/new-users/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	1999/08/16 22:09:09	1.4
+++ Makefile	1999/08/23 12:19:26
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/articles/programming-tools/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/articles/programming-tools/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1999/08/16 22:09:10	1.5
+++ Makefile	1999/08/23 12:19:50
@@ -9,6 +9,6 @@
 
 SRCS= article.sgml
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/books/faq/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/books/faq/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	1999/08/17 21:52:02	1.1
+++ Makefile	1999/08/23 12:22:25
@@ -21,6 +21,6 @@
 # SGML content
 SRCS=  book.sgml 
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/books/fdp-primer/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/books/fdp-primer/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1999/07/14 22:31:29	1.3
+++ Makefile	1999/08/23 12:23:50
@@ -36,6 +36,6 @@
 # Entities
 SRCS+= chapters.ent 
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: en_US.ISO_8859-1/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO_8859-1/books/handbook/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	1999/08/17 21:35:54	1.22
+++ Makefile	1999/08/23 12:24:41
@@ -55,5 +55,5 @@
 SRCS+= chapters.ent 
 SRCS+= mailing-lists.ent
 
-DOC_PREFIX?= ../../..
-.include "../../../share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ${.CURDIR}/../../..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: es_ES.ISO_8859-1/Makefile
===================================================================
RCS file: /home/ncvs/doc/es_ES.ISO_8859-1/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	1999/08/19 20:35:57	1.4
+++ Makefile	1999/08/24 06:39:47
@@ -18,5 +18,5 @@
 
 .include <bsd.subdir.mk>
 
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: es_ES.ISO_8859-1/books/faq/Makefile
===================================================================
RCS file: /home/ncvs/doc/es_ES.ISO_8859-1/books/faq/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	1999/08/18 13:04:30	1.1
+++ Makefile	1999/08/24 06:40:20
@@ -21,6 +21,6 @@
 # SGML content
 SRCS=  book.sgml 
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: ja_JP.eucJP/Makefile
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	1999/08/19 20:35:58	1.7
+++ Makefile	1999/08/24 06:40:59
@@ -20,5 +20,5 @@
 
 .include <bsd.subdir.mk>
 
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: ja_JP.eucJP/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/ja_JP.eucJP/books/handbook/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	1999/08/16 22:09:12	1.35
+++ Makefile	1999/08/24 06:42:03
@@ -64,5 +64,5 @@
 SRCS+=	jcontrib/chapter.sgml
 SRCS+=	jauthors.ent
 
-DOC_PREFIX?= ../../..
-.include "../../../share/mk/docproj.docbook.mk"
+DOC_PREFIX?= ${.CURDIR}/../../..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: ru_RU.KOI8-R/Makefile
===================================================================
RCS file: /home/ncvs/doc/ru_RU.KOI8-R/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1999/08/19 20:36:00	1.3
+++ Makefile	1999/08/24 06:42:46
@@ -25,5 +25,5 @@
 
 .include <bsd.subdir.mk>
 
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: zh_TW.Big5/Makefile
===================================================================
RCS file: /home/ncvs/doc/zh_TW.Big5/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	1999/08/19 20:36:02	1.3
+++ Makefile	1999/08/24 06:44:26
@@ -18,5 +18,5 @@
 
 .include <bsd.subdir.mk>
 
-DOC_PREFIX = ..
-.include "../share/mk/docproj.docbook.mk"
+DOC_PREFIX = ${.CURDIR}/..
+.include "${DOC_PREFIX}/share/mk/docproj.docbook.mk"
Index: zh_TW.Big5/books/faq/Makefile
===================================================================
RCS file: /home/ncvs/doc/zh_TW.Big5/books/faq/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	1999/08/19 03:56:59	1.1
+++ Makefile	1999/08/24 06:45:03
@@ -21,6 +21,6 @@
 # SGML content
 SRCS=  book.sgml 
 
-DOC_PREFIX?= ../../..
+DOC_PREFIX?= ${.CURDIR}/../../..
 
-.include "../../../share/mk/docproj.docbook.mk"
+.include "${.CURDIR}/share/mk/docproj.docbook.mk"

>Release-Note:
>Audit-Trail:

From: Nik Clayton <nik@freebsd.org>
To: nbm@rucus.ru.ac.za
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: docs/13345: obj-related DOC_PREFIX? changes
Date: Tue, 24 Aug 1999 17:34:38 +0100

 On Tue, Aug 24, 1999 at 08:41:01AM -0000, nbm@rucus.ru.ac.za wrote:
 > >Description:
 > 
 > These are pretty arbitrary preliminary changes to make obj'able doc
 > builds possible.  The real stuff depends on this.  It applies to all
 > languages.  
 
 These certainly look OK, but I haven't got sufficient make(1) expertise
 to verify that they're doing the right thing.  Could someone who does,
 (Satoshi?  You expressed a strong interest in this) try these, and either
 commit them (if you're a committer) or let me know if they do they right
 thing, and I'll commit them.
 
 > It doesn't cover the tutorials, as they're governed by
 > web.mk (and that's a whole other story)
 
 doc/en*/tutorials/ is a hangover that will be vanishing soon.  A couple
 of the entries in there still have to be migrated in to the articles/
 or books/ directory, and then the tutorials directory will vanish as well.
 
 N
 -- 
  [intentional self-reference] can be easily accommodated using a blessed,
  non-self-referential dummy head-node whose own object destructor severs
  the links.
     -- Tom Christiansen in <375143b5@cs.colorado.edu>
 
State-Changed-From-To: open->closed 
State-Changed-By: jkoshy 
State-Changed-When: Sun Oct 3 20:37:16 PDT 1999 
State-Changed-Why:  
Closed at originators request. 
Message-ID: <19991003140217.A25628@rucus.ru.ac.za> on freebsd-doc 
>Unformatted:
