Date: Fri, 19 Oct 2001 14:00:04 -0700 (PDT) From: Cyrille Lefevre <clefevre@citeweb.net> To: freebsd-doc@freebsd.org Subject: Re: docs/31350: make of doc module fails after 'make obj' Message-ID: <200110192100.f9JL04w62449@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR docs/31350; it has been noted by GNATS.
From: Cyrille Lefevre <clefevre@citeweb.net>
To: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: docs/31350: make of doc module fails after 'make obj'
Date: Fri, 19 Oct 2001 22:52:15 +0200 (CEST)
Akio Morita wrote:
> Cyrille wrote:
>
> >Akio Morita wrote:
> >>
> >> >Number: 31350
> >> >Category: docs
> >> >Synopsis: make of doc module fails after 'make obj'
> >
> >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.
sorry, but it doesn't.
root@gits:vm-design/ (ttyp1) [22:38:02-11]# make package
Creating package /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.txt.tgz
Using SrcDir value of .
Creating gzip'd tar ball in '/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.txt.tgz'
tar: Can't change to directory /usr/share/doc/en_US.ISO8859-1/articles/vm-design : No such file or directory
tar: can't add file article.txt : No such file or directory
pkg_create: make_dist: tar command failed with code 256
*** Error code 2
Stop in /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design.
root@gits:vm-design/ (ttypa) [22:40:46-51]# make FORMATS=html\ html-split package
echo docbook.css >> PLIST
Creating package /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.html.tgz
Using SrcDir value of .
Creating gzip'd tar ball in '/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.html.tgz'
tar: Can't change to directory /usr/share/doc/en_US.ISO8859-1/articles/vm-design : No such file or directory
tar: can't add file article.html : No such file or directory
tar: can't add file docbook.css : No such file or directory
tar: can't add file fig1.png : No such file or directory
tar: can't add file fig2.png : No such file or directory
tar: can't add file fig3.png : No such file or directory
tar: can't add file fig4.png : No such file or directory
pkg_create: make_dist: tar command failed with code 256
*** Error code 2
Stop in /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design.
> 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.
IMHO, they should go to /usr/obj/... if you consider that /usr/doc
is read-only mounted.
> --- 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
this is wrong :
root@gits:vm-design/ (ttypa) [22:45:25-57]# make -V CSS_SHEET
/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/../../../share/misc/docbook.css
> +.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
did you try PR #31131 which exactly cover the same subject w/ some
cleanup ?
Cyrille.
--
Cyrille Lefevre mailto:clefevre@citeweb.net
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110192100.f9JL04w62449>