3 files changed, 7 insertions, 5 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index bda2a132f..4384f83f7 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -19,7 +19,7 @@ define BZIP2.INSTALL
 endef
 
 define BZIP2.UNINSTALL
-    $(RM.exe) $(CONTRIB.build/)lib/libbz2.a
-    $(RM.exe) $(CONTRIB.build/)include/bzlib.h
+    $(RM.exe) -f $(CONTRIB.build/)lib/libbz2.a
+    $(RM.exe) -f $(CONTRIB.build/)include/bzlib.h
     $(RM.exe) -f $(BZIP2.INSTALL.target)
 endef
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index b41291018..04b060910 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -28,5 +28,5 @@ FFMPEG.CONFIGURE.extra = \
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
 
 ifeq ($(BUILD.cross),1)
-    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(FFMPEG.GCC.archs)
+    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(BUILD.machine)
 endif
diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
index f25d89d77..dee8b3e45 100644
--- a/contrib/xvidcore/module.defs
+++ b/contrib/xvidcore/module.defs
@@ -9,6 +9,8 @@ XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.ntargets = libxvidcore.a
 
+XVIDCORE.CLEAN.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
+
 define XVIDCORE.INSTALL
     $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
     $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
@@ -16,7 +18,7 @@ define XVIDCORE.INSTALL
 endef
 
 define XVIDCORE.UNINSTALL
-    $(RM.exe) $(CONTRIB.build/)lib/libxvidcore.a
-    $(RM.exe) $(CONTRIB.build/)include/xvid.h
+    $(RM.exe) -f $(CONTRIB.build/)lib/libxvidcore.a
+    $(RM.exe) -f $(CONTRIB.build/)include/xvid.h
     $(RM.exe) -f $(XVIDCORE.INSTALL.target)
 endef