From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 13 Mar 2003 20:50:59 +0000 (+0000)
Subject: * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
X-Git-Tag: v1.10.2~963
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b36e1c8d767cae5008ff244b17ca7300a298d516;p=platform%2Fupstream%2Fautomake.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index 9179b22..f704fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-03-13  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* 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  <adl@gnu.org>
diff --git a/THANKS b/THANKS
index 5a6e93f..4ab8d48 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 51fd1eb..dc0e243 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%