summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-03-23 17:55:38 +0100
committerLuca Barbieri <luca@luca-barbieri.com>2010-03-23 17:57:59 +0100
commitfff86eb0aab506fdfe3e956587d453c52ab07730 (patch)
tree375dd34708d9c3618cd45dcae2200a1c814f75b3
parent2689dd304c6d644b04c941e6da63e466be5de0d6 (diff)
dri: use mv -f instead of mv to ensure no prompting occurs
Using just mv may cause prompts on some systems/configurations.
-rw-r--r--src/gallium/winsys/drm/Makefile.template2
-rw-r--r--src/mesa/drivers/dri/Makefile.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index 9f984f1090..7146e112d0 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -71,7 +71,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
$(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
$(CC) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp -L$(TOP)/lib -lGL
@rm -f $@.test
- mv $@.tmp $@
+ mv -f $@.tmp $@
$(TOP)/$(LIB_DIR)/gallium:
mkdir -p $@
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 2b7634bbf6..15682b76ff 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -56,7 +56,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
$(CC) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp -L$(TOP)/lib -lGL
@rm -f $@.test
- mv $@.tmp $@
+ mv -f $@.tmp $@
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)