# 
# patch "ChangeLog"
#  from [fb4faf62c1ae0dc2c50ff7359f32adb4ffe44154]
#    to [87c6a31b367decca23ae236f4f256fb105f473f1]
# 
# patch "Makefile.am"
#  from [8aefb7ba1e9e19ac619b8828bbcdd8106ee3e7fa]
#    to [b6fd525a4e3812c36b7ce2a87f40a3fb3445d3fa]
# 
========================================================================
--- ChangeLog	fb4faf62c1ae0dc2c50ff7359f32adb4ffe44154
+++ ChangeLog	87c6a31b367decca23ae236f4f256fb105f473f1
@@ -1,3 +1,8 @@
+2005-09-08  Matthew Gregan  <address@hidden>
+
+	* Makefile.am: Add '-f' argument to 'mv'; avoids build waiting on
+	 user confirmation in some cases.
+
 2005-09-08  Nathaniel Smith  <address@hidden>
 
 	* monotone.texi (Certificates): Remove mention of fcerts and
========================================================================
--- Makefile.am	8aefb7ba1e9e19ac619b8828bbcdd8106ee3e7fa
+++ Makefile.am	b6fd525a4e3812c36b7ce2a87f40a3fb3445d3fa
@@ -361,7 +361,7 @@
 monotone.dvi: monotone.texi version.texi std_hooks.lua $(EPS_FIGURES)
 
 #%.eps: %.epsi
-#	mv $< $@
+#	mv -f $< $@
 #
 #%.epsi: %.ps
 #	ps2epsi $< $@
@@ -408,7 +408,7 @@
 $(srcdir)/testsuite: $(srcdir)/testsuite.at $(wildcard $(srcdir)/tests/t_*.at) \
                      $(srcdir)/package.m4 
 	autom4te --language=Autotest -I $(srcdir) $< -o address@hidden
-	mv address@hidden $@
+	mv -f address@hidden $@
 
 # we generate some headers to copy data into the executable
 
@@ -428,12 +428,12 @@
 
 %.h: %.sql txt2c Makefile
 	./txt2c $< $(*F) >address@hidden
-	cmp -s address@hidden $@ || mv address@hidden $@
+	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
 %.h: %.lua txt2c Makefile
 	./txt2c $< $(*F) >address@hidden
-	cmp -s address@hidden $@ || mv address@hidden $@
+	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
 # A fake target so we can use MT/revision as a prerequisite, yet not
@@ -445,7 +445,7 @@
 	if [ ! -f $@ ]; then echo "unknown" > $@; fi
 package_revision.c: package_revision.txt txt2c Makefile
 	./txt2c --strip-trailing --no-static $< package_revision >address@hidden
-	cmp -s address@hidden $@ || mv address@hidden $@
+	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
 .PHONY: package_full_revision.txt apidocs
@@ -462,7 +462,7 @@
 	 echo '  further changes may have been made.') >> $@
 package_full_revision.c: package_full_revision.txt txt2c Makefile
 	./txt2c --no-static $< package_full_revision >address@hidden
-	cmp -s address@hidden $@ || mv address@hidden $@
+	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
 # automake doesn't build html docs