Re: [PATCH] mostly-clean/texi: remove $relative_dir/ prefix

[Jim Meyering]

Stefano Lattarini wrote:
> On 06/30/2012 01:53 PM, Jim Meyering wrote:
>> Hi Stefano,
>>
> Hi Jim, thanks for the report and patch.
>
>> I found that the following patch is required at least
>> for vc-dwim, where without it, "make distcheck" would
>> fail due to the presence of vc-dwim.t2d/ and all of the
>> files in that directory:  they would not be removed
>> because the rule was running "rm -rf doc/vc-dwim.t2d"
>> from within the doc/ sub-directory.  Obviously, we cannot
>> use the doc/ prefix in that case.
>>
>> With this patch, automake (master) still passes "make check".
>
> I've applied it, tweaking the commit message like this:
>
>     texi: clean after Texinfo manuals in $(SUBDIRS) directories correctly

How about this?

      texi: clean up after texi2dvi --build-dir=... in $(SUBDIRS)

>     * automake.in (handle_texinfo_helper): Add $infobase.{t2d,t2p}
>     to @mostly_cleans, but *without* the '$relative_dir/' prefix.
>
> and exposing the bug in the testsuite with the patch below.
...
> Subject: [PATCH] coverage: regression in texinfo "make mostlyclean" with
>  $(SUBDIRS)
>
> After commit v1.12.1-91-g205c757 of 2012-06-20, "texi: require
> Texinfo >= 4.9, related enhancements", the presence of a Texinfo manual
> 'manual.texi' in a subdir (say 'doc/') of a package using a recursive
> make setup would cause "make distcheck" to fail, due to the presence of
> the 'manual.t2d/' directory created by texi2dvi.  That directory would
> not be correctly removed because the 'mostlyclean' rule would run, from
> within the 'doc/' sub-directory, "rm -rf doc/manual.t2d", instead of
> the expected (and correct) "rm -rf manual.t2d".
>
> Reported by Jim Meyering:
> <http://lists.gnu.org/archive/html/automake-patches/2012-06/msg00203.html>
>
> * t/txinfo21.sh: Enhance to expose the issue.
> * t/txinfo-no-clutter.sh: Likewise, and other miscellaneous improvements.

Nice.  Thanks!