[OpenJade-devel] Re: doc/@PACKAGE@/html (Re: OpenSP 1.5 nits)

[Karl E. <ke...@gm...>]

Ville Skytt=E4 <vil...@ik...> writes:

> On Sat, 2002-11-30 at 07:11, Karl Eichwalder wrote:
>
>> +All documentation is in HTML format in the doc directory resp. the html
>> +directory once installed.  Start with doc/index.htm resp. html/index.ht=
m.
>
> Uh, what does this mean, the "resp." stuff?  Shouldn't it be just:

Yes, it's ugly.

>   All documentation is in HTML format in the html directory once
>   installed.  Start with html/index.htm.

Better, but I didn't want to rename "doc/" to "html/" in the CVS.  I
guess we better leave it asis and install the html files into
$(datadir)/doc/@PACKAGE@/doc.  Later (1.6?) we can change it.  Next try:

diff -u /home/ke/Projects/opensp/doc/Makefile.am.\~1.2.4.2.\~ /home/ke/Proj=
ects/opensp/doc/Makefile.am
--- /home/ke/Projects/opensp/doc/Makefile.am.~1.2.4.2.~	2002-11-16 20:13:51=
.000000000 +0100
+++ /home/ke/Projects/opensp/doc/Makefile.am	2002-11-30 11:48:38.000000000 =
+0100
@@ -1,11 +1,12 @@
 ## Process this file with automake to produce Makefile.in
=20
-docdir =3D $(prefix)/doc
+docdir =3D $(datadir)/doc
 pkgdocdir =3D $(docdir)/@PACKAGE@
+pkgdochtmldir =3D $(pkgdocdir)/doc
=20
 MAINTAINERCLEANFILES =3D Makefile.in
=20
-pkgdoc_DATA =3D archform.htm build.htm catalog.htm charset.htm \
+pkgdochtml_DATA =3D archform.htm build.htm catalog.htm charset.htm \
 	features.htm generic.htm ideas.htm index.htm new.htm nsgmls.htm \
 	sgmldecl.htm sgmlnorm.htm sgmlsout.htm spam.htm spcat.htm \
 	spent.htm sx.htm sysdecl.htm sysid.htm xml.htm xmlwarn.htm \

Diff finished at Sat Nov 30 11:48:48


>> +%doc ABOUT-NLS AUTHORS COPYING NEWS README
>>  %{_bindir}/*
>>  %{_datadir}/@PACKAGE@/*
>> -%doc /usr/doc/@PACKAGE@/*
>> +%doc %{_datadir}/doc/@PACKAGE@/html/*
>
> ...maybe the last line should be actually:
>
>    %doc %{_datadir}/doc/@PACKAGE@/html
>
> Otherwise the *.htm files will land in the same dir as README and
> friends.

I didn't test it thus far; you are probably right.  Next try:

diff -u /home/ke/Projects/opensp/spec.in.\~1.1.2.7.\~ /home/ke/Projects/ope=
nsp/spec.in
--- /home/ke/Projects/opensp/spec.in.~1.1.2.7.~	2002-11-16 20:13:51.0000000=
00 +0100
+++ /home/ke/Projects/opensp/spec.in	2002-11-30 11:51:25.000000000 +0100
@@ -59,9 +59,10 @@
=20
 %files
 %defattr(-, root, root)
+%doc ABOUT-NLS AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/@PACKAGE@/*
-%doc /usr/doc/@PACKAGE@/*
+%doc %{_datadir}/doc/@PACKAGE@/doc
=20
 %files lib
 %defattr(-, root, root)

Diff finished at Sat Nov 30 11:51:30


--=20
ke...@su... (work) / ke...@gm... (home):              |
http://www.gnu.franken.de/ke/                            |      ,__o
Free Translation Project:                                |    _-\_<,
http://www.iro.umontreal.ca/contrib/po/HTML/             |   (*)/'(*)