Le 17 juin 2012 à 10:53, Stefano Lattarini a écrit : > On 06/17/2012 09:11 AM, Akim Demaille wrote: >> >> Le 16 juin 2012 à 23:30, Stefano Lattarini a écrit : >> >>> * lib/am/texi-vers.am (%STAMPVTI%): We don't really care anymore about >>> older systems whose 'mv' program can't move across file systems, nor do >>> we care about past problems of GNU mv in the AmigaDOS environment. So >>> simplify the code accordingly. >>> >>> Signed-off-by: Stefano Lattarini <[email protected]> >>> --- >>> lib/am/texi-vers.am | 12 +++++------- >>> 1 file changed, 5 insertions(+), 7 deletions(-) >>> >>> diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am >>> index ec2f366..1148c50 100644 >>> --- a/lib/am/texi-vers.am >>> +++ b/lib/am/texi-vers.am >>> @@ -33,13 +33,11 @@ am__dist_common += %VTEXI% %STAMPVTI% >>> echo "@set UPDATED-MONTH $$2 $$3"; \ >>> echo "@set EDITION $(VERSION)"; \ >>> echo "@set VERSION $(VERSION)") > %VTI%.tmp >>> -## Use cp and rm here because some older "mv"s can't move across >>> -## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment >>> -## can't handle this. >>> - @cmp -s %VTI%.tmp %VTEXI% \ >>> - || (echo "Updating %VTEXI%"; \ >>> - cp %VTI%.tmp %VTEXI%) >>> - -@rm -f %VTI%.tmp >>> + @if cmp -s %VTI%.tmp %VTEXI%; then \ >>> + echo "Updating %VTEXI%" && cp %VTI%.tmp %VTEXI%; \ >> >> You mean mv -f I guess. >> > Oops, fixed. Thanks for spotting. > >> I don't see what %VTEXI% is, >> > It's (usually) the auto-generated 'version.texi' file that is included in > the Texinfo manual; for example, for my Automake-NG: > > $ cat doc/version.texi > @set UPDATED 15 June 2012 > @set UPDATED-MONTH June 2012 > @set EDITION 1.12a > @set VERSION 1.12a > >> but I would bet that [email protected], or something like that, would suffice. >> > I don't see how; %VTEXI% must be a permanent, distributed file.
Ah, ok. > Or did > you mean '%VTI%' instead of '%VTEXI%'? The patch does not should enough context, but reading things like >>> + @if cmp -s %VTI%.tmp %VTEXI%; then \ >>> + echo "Updating %VTEXI%" && cp %VTI%.tmp %VTEXI%; \ left me believe that we were in some '%VTEXI%: ' rule, in which case $@ would have made things more readable. But laking the context, I don't know more. Just drop if it does not apply.
