From: Rémi Denis-Courmont <rem@videolan.org>
Date: Tue, 28 Feb 2006 08:42:23 +0000 (+0000)
Subject: mv -> mv -f
X-Git-Tag: 0.9.0-test0~12135
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6a73573370bfd2f4fb49480074c65b9634f05b3a;p=vlc

mv -> mv -f
---

diff --git a/activex/Makefile.am b/activex/Makefile.am
index cf605b545c..7d88e355d3 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -85,7 +85,7 @@ axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
 	  $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
 	  $(INCLUDED_LIBINTL)
 # Cygwin work-around
-	@if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
+	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)
diff --git a/bootstrap b/bootstrap
index e6a94a61a2..b46cd8a04f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -260,9 +260,9 @@ _plugin.a_plugin\$(LIBEXT):
 	echo \$\$ld \$< \$\$ldfl ; \
 	\$\$ld \$< \$\$ldfl
 #ifneq (,\$(findstring cygwin,\$(host)))
-#	mv "$@.exe" "$@"
+#	mv -f "$@.exe" "$@"
 #endif
-	@if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
+	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
 if MAINTAINER_MODE
 \$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 8581f894b3..4c3c909c01 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -129,7 +129,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
 	$(CXXLINK) $(libnpvlc_a_OBJECTS) $(DATA_npvlc_rc) \
 	 $(LDFLAGS_libnpvlc)
 # Cygwin work-around
-	@if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
+	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 
 vlcintf_xptdir = $(libdir)/mozilla/components
 vlcintf.xpt: vlcintf.idl
diff --git a/src/Makefile.am b/src/Makefile.am
index 4d174c2ce3..29fc834c6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -213,7 +213,7 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
 # libvlc$(LIBEXT)
 	rm -f libvlc.a
 # Cygwin work-around
-	@if test -f "$@.exe"; then mv "$@.exe" "$@"; fi
+	@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
 endif
 
 EXTRA_DIST += \