Robert Buchholz schrieb:
> On Sunday, 5. October 2008, Ulrich Mueller wrote:
>>>>>>> On Sun, 5 Oct 2008, Robert Buchholz wrote:
>>>>> It's not. If you want to have default DOCS then you should loop
>>>>> through the items and check with [[ -e ]] before trying to
>>>>> install them.
>>>> So, maybe just do a 'dodoc "${DOCS}"' and omit the die? Then it won't
>>>> fail but the warning message would be preserved.
>>> I understood Petteri's comment to be related to the default case
>>> (i.e. the else-branch), and I have to agree there: Ebuilds that do
>>> not override src_install should not emit a warning when some
>>> ChangeLog file is missing that the ebuild never specified to
>>> install.
>> The default would be an empty DOCS variable, or did I miss something?
>
> Correct.
>
>> So if the ebuild includes non-existing files in DOCS, then why would
>> you want to suppress the warnings?
>
> I don't. My point was that the default action on an empty DOCS variable is
> to "dodoc AUTHORS ChangeLog NEWS README", and this should not emit
> warnings, because it is merely a heuristic.
>
> To be clearer:
> else
> - # No die here because we don't know if any of these exist
> - dodoc AUTHORS ChangeLog NEWS README
> + for x in AUTHORS ChangeLog NEWS README; do
> + if [ -e ${x} ]; then
> + dodoc ${x} || die "dodoc ${x} failed"
> + fi
> + done
> fi
>
>
> Robert
So what about this funcion for the next EAPI and also implementation in
base.eclass?
default_src_install() {
if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
emake DESTDIR="${D}" install || die "emake install failed"
fi
if [ -n "${DOCS}" ]; then
dodoc ${DOCS} || die "dodoc failed"
else
for x in AUTHORS ChangeLog NEWS README; do
if [ -e ${x} ]; then
dodoc ${x} || die "dodoc ${x} failed"
fi
done
fi
}
--
Thomas Sachau
Gentoo Linux Developer
signature.asc
Description: OpenPGP digital signature
