2 files changed, 10 insertions, 6 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index dcc878ad4..83107cfdc 100644
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -14,11 +14,13 @@ BZIP2.BUILD.ntargets = libbz2.a
 
 define BZIP2.INSTALL
     mkdir -p $(CONTRIB.build/)lib/ $(CONTRIB.build/)include/
-    cp $(BZIP2.EXTRACT.target/)libbz2.a $(CONTRIB.build/)lib/
-    cp $(BZIP2.EXTRACT.target/)bzlib.h $(CONTRIB.build/)include/
+    cp $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/
+    cp $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/
+    $(TOUCH.exe) $@
 endef
 
 define BZIP2.UNINSTALL
     rm $(CONTRIB.build/)lib/libbz2.a
     rm $(CONTRIB.build/)include/bzlib.h
+    $(RM.exe) -f $(BZIP2.INSTALL.target)
 endef
diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
index 0ec291a24..c45059b23 100644
--- a/contrib/xvidcore/module.defs
+++ b/contrib/xvidcore/module.defs
@@ -4,17 +4,19 @@ $(eval $(call import.CONTRIB.defs,XVIDCORE))
 XVIDCORE.FETCH.url = http://download.m0k.org/handbrake/contrib/xvidcore-1.1.3.tar.gz
 XVIDCORE.EXTRACT.tarbase = xvidcore
 
-XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.target/)build/generic/
+XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
 
-XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.target/)build/generic/
+XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.ntargets = libxvidcore.a
 
 define XVIDCORE.INSTALL
-    cp $(XVIDCORE.EXTRACT.target/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
-    cp $(XVIDCORE.EXTRACT.target/)src/xvid.h $(CONTRIB.build/)include/
+    cp $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
+    cp $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
+    $(TOUCH.exe) $@
 endef
 
 define XVIDCORE.UNINSTALL
     rm $(CONTRIB.build/)lib/libxvidcore.a
     rm $(CONTRIB.build/)include/xvid.h
+    $(RM.exe) -f $(XVIDCORE.INSTALL.target)
 endef