From owner-freebsd-doc  Thu Oct 18 22:50: 8 2001
Delivered-To: freebsd-doc@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 57E7C37B403
	for <freebsd-doc@freebsd.org>; Thu, 18 Oct 2001 22:50:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f9J5o1l79998;
	Thu, 18 Oct 2001 22:50:01 -0700 (PDT)
	(envelope-from gnats)
Date: Thu, 18 Oct 2001 22:50:01 -0700 (PDT)
Message-Id: <200110190550.f9J5o1l79998@freefall.freebsd.org>
To: freebsd-doc@freebsd.org
Cc: 
From: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
Subject: Re: docs/31350: make of doc module fails after 'make obj'
Reply-To: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org

The following reply was made to PR docs/31350; it has been noted by GNATS.

From: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
To: clefevre@citeweb.net
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: docs/31350: make of doc module fails after 'make obj'
Date: 19 Oct 2001 14:46:20 +0900

 Cyrille wrote:
 
 >Akio Morita wrote:
 >> 
 >> >Number:         31350
 >> >Category:       docs
 >> >Synopsis:       make of doc module fails after 'make obj'
 >
 >Hi,
 >
 >you are duplicating the job I'm doing.  see PR #31131 for details.
 >
 (snip)
 >
 >does this patch set is `make package' compatible ?
 >how about .tar archives ?
 >
 Last night, I tested package target.
 In this test, I found erratas of package rule generation in doc.docbook.mk.
 I made a following errata fix.
    i. Correct typo (doc.docbook.mk)
   ii. Correct docbook.css insertion to PLIST (doc.docbook.mk)
  iii. Add ${CSS_SHEET} and images to PLIST (doc.html.mk)
       (en_US.ISO8859-1/articles/console-server needs this)
 
 With following patch, package target of my patch set (PR:31350)
 seems to work fine.
 
 Results of `make package' in doc directory.
 o doc/packages exists
 Whole packages (*.tgz archive) are stored into doc/packages directory.
 
 o otherwise
 Each package is stored into its source directory.
 Ex) package `committers-guide.en_US.ISO8859-1.html.tgz' is stored
     into doc/en_US.ISO8859-1/articles/committers-guide directory.
 
 --- errata fix ---
 --- share/mk/doc.docbook.mk.OLD	Fri Oct 19 14:25:51 2001
 +++ share/mk/doc.docbook.mk	Fri Oct 19 14:26:46 2001
 @@ -591,16 +591,16 @@
  .if ${_cf} == "html-split"
  package-${_curformat}: index.html
  	@cp HTML.manifest PLIST
 +	echo docbook.css >> PLIST
  	@for images_png in ${IMAGES_PNG}; do \
  		echo $$images_png >> PLIST; \
 -		echo docbook.css >> PLIST; \
  	done
  .elif ${_cf} == "html"
 -package-${curformat}: ${DOC}.html
 +package-${_curformat}: ${DOC}.html
  	@echo ${DOC}.${_curformat} > PLIST
 +	echo docbook.css >> PLIST
  	@for images_png in ${IMAGES_PNG}; do \
  		echo $$images_png >> PLIST; \
 -		echo docbook.css >> PLIST; \
  	done
  .else
  package-${_curformat}: ${DOC}.${_curformat}
 --- share/mk/doc.html.mk.OLD	Fri Oct 19 14:28:58 2001
 +++ share/mk/doc.html.mk	Fri Oct 19 14:37:14 2001
 @@ -304,6 +304,12 @@
  _cf=${_curformat}
  package-${_curformat}: install-${_curformat}
  	@echo ${DOC}.${_curformat} > PLIST
 +.if defined(CSS_SHEET)
 +	@echo ${CSS_SHEET} >> PLIST
 +.endif
 +	@for images_png in ${IMAGES_PNG}; do \
 +		echo $$images_png >> PLIST; \
 +	done
  	@pkg_create -v -c -"FDP ${.CURDIR:T} ${_curformat} package" \
  		-d -"FDP ${.CURDIR:T} ${_curformat} package" -f PLIST \
  		-p ${DESTDIR} ${PACKAGES}/${.CURDIR:T}.${LANGCODE}.${_curformat}.tgz
 --- errata fix ---
 
 --
 Akio Morita
    E-mail:  amorita@FreeBSD.org

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message