On Feb 10, 2009, at 11:26 AM, Mark Burgess wrote:
> Can you just send me a patch please? I don't know much about these
> things, and I don't want to spend any time finding out.
Real quick hand patch that you have to read ;-)
tests/file_masters/Makefile.in
< docdir = $(pkgdatadir)
> docdir = @docdir@
tests/units/Makefile.in
< docdir = $(pkgdatadir)
> docdir = @docdir@
docs/Makefile.in
< htmldir = $(pkgdatadir)/html
> htmldir = @htmldir@
> Jo Rhett wrote:
>> Hm. Somewhat inconsistently...
>>
>> jrh...@wort 34$ grep ^docdir work/cfengine-3.0.1a7/tests/*/
>> Makefile.in
>> work/cfengine-3.0.1a7/tests/file_masters/Makefile.in:docdir = $
>> (pkgdatadir)
>> work/cfengine-3.0.1a7/tests/file_operands/Makefile.in:docdir =
>> @docdir@
>> work/cfengine-3.0.1a7/tests/units/Makefile.in:docdir = $(pkgdatadir)
>>
>> Also the --htmldir option to configure is likewise ignored. It
>> doesn't accept the input *AND* it isn't what configure says the
>> default is:
>>
>> jrh...@wort 44$ work/cfengine-3.0.1a7/configure --help |grep html
>> --htmldir=DIR html documentation [DOCDIR]
>>
>> jrh...@wort 45$ grep ^htmldir work/cfengine-3.0.1a7/docs/Makefile.in
>> htmldir = $(pkgdatadir)/html
>>
>> On Feb 4, 2009, at 2:33 PM, Mark Burgess wrote:
>>> Done
>>>
>>> Jo Rhett wrote:
>>>> So as I'm working on the freebsd port I noticed that --docdir= is
>>>> being ignored in favor of datadir. In fact, this appears to have
>>>> been
>>>> true for some time, since it has been in the port as far back as I
>>>> have local copies (2.1.17 or thereabouts)
>>>>
>>>> The patch in the port is
>>>>
>>>> @${REINPLACE_CMD} -e '/^docdir/s!=.*!= @doc...@!'\
>>>> ${WRKSRC}/docs/Makefile.in
>>>>
>>>> This changes the following -- which frankly, seems like the right
>>>> thing to do. If someone supplied a --docdir on the configure line,
>>>> why aren't we using it?
>>>>
>>>> 176c176
>>>> < docdir = $(pkgdatadir)/doc
>>>> ---
>>>>> docdir = @docdir@
>>
>
> --
> Mark Burgess
>
> -------------------------------------------------
> Professor of Network and System Administration
> Oslo University College, Norway
>
> Personal Web: http://www.iu.hio.no/~mark
> Office Telf : +47 22453272
> -------------------------------------------------
--
Jo Rhett
Net Consonance : consonant endings by net philanthropy, open source
and other randomness
_______________________________________________
Bug-cfengine mailing list
[email protected]
https://cfengine.org/mailman/listinfo/bug-cfengine
