From 94ac396239d9c0d3c0865a337e84cd59c87ee847 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 13 Mar 2003 20:50:58 +0000 Subject: [PATCH] * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj) (?GENERIC?%EXT%.lo): Use `mv -f' instead of `mv' in FASTDEP mode. Suggested by Matthias Andree. --- ChangeLog | 4 ++++ THANKS | 1 + lib/am/depend2.am | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9179b224..f704fb44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-03-13 Alexandre Duret-Lutz + * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj) + (?GENERIC?%EXT%.lo): Use `mv -f' instead of `mv' in FASTDEP mode. + Suggested by Matthias Andree. + * tests/README: Typo. 2003-03-08 Alexandre Duret-Lutz diff --git a/THANKS b/THANKS index 5a6e93fd..4ab8d488 100644 --- a/THANKS +++ b/THANKS @@ -132,6 +132,7 @@ Martin Frydl martin@idoox.com Mathias Doreille doreille@smr.ch Matt Leach mleach@cygnus.com Matthew D. Langston langston@SLAC.Stanford.EDU +Matthias Andree matthias.andree@gmx.de Matthias Clasen clasen@mathematik.uni-freiburg.de Maxim Sinev good@goods.ru Merijn de Jonge M.de.Jonge@cwi.nl diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 51fd1ebe..dc0e2431 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -47,7 +47,7 @@ if %FASTDEP% ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. ?!GENERIC? %-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \ ?GENERIC? %-c% -o %OBJ% %SOURCE%; \ - then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \ + then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \ else rm -f "%DEPBASE%.Tpo"; exit 1; \ fi else !%FASTDEP% @@ -77,7 +77,7 @@ if %FASTDEP% ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. ?!GENERIC? %-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \ ?GENERIC? %-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \ - then mv "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \ + then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; \ else rm -f "%DEPBASE%.Tpo"; exit 1; \ fi else !%FASTDEP% @@ -108,7 +108,7 @@ if %FASTDEP% ?GENERIC? %-c% -o %LTOBJ% %SOURCE%; \ ## For non-suffix rules, we must emulate a VPATH search on %SOURCE%. ?!GENERIC? %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \ - then mv "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; \ + then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; \ else rm -f "%DEPBASE%.Tpo"; exit 1; \ fi else !%FASTDEP% -- 2.43.5