Index: /trunk/src/VBox/Additions/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 31132)
+++ /trunk/src/VBox/Additions/linux/Makefile.kmk	(revision 31133)
@@ -5,5 +5,5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68,13 +68,13 @@
  # OSE only contains the source code for this
  VBOX_SELINUX_CMPLD := $(PATH_SUB_CURRENT)/selinux-fedora/vbox_x11.pp
- VBOX_LNX_ADD_ARCHIVE.x86 := $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-x86-r$(VBOX_SVN_REV).tar.bz2
+ VBOX_LNX_ADD_ARCHIVE.x86   := $(PATH_OUT_BASE)/linux.x86/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-x86-r$(VBOX_SVN_REV).tar.bz2
  VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64-r$(VBOX_SVN_REV).tar.bz2
-ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
+ ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
   VBOX_LNX_ADD_ARCHIVES := $(PATH_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2
-else
+ else
   VBOX_LNX_ADD_ARCHIVES := \
   	$(VBOX_LNX_ADD_ARCHIVE.x86) \
   	$(VBOX_LNX_ADD_ARCHIVE.amd64)
-endif
+ endif
  BLDDIRS     += \
  	$(VBOX_LNX_ADD_INST_OUT_DIR) \
@@ -95,6 +95,8 @@
  	$(VBOX_LNX_ADD_ARCHIVES) \
  	$(PATH_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2
- OTHER_CLEAN += $(PACKING)
-endif
+ OTHER_CLEAN += \
+ 	$(PACKING) \
+ 	$(foreach file, $(VBOX_LNX_ADD_ARCHIVES), $(VBOX_LNX_ADD_INST_STAGE_DIR)$(subst -r$(VBOX_SVN_REV),,$(notdir $(file))))
+endif # !VBOX_OSE
 
 
@@ -482,10 +484,7 @@
 		$$(INSTARGET_LnxAdd-scripts) \
 		$(VBOX_VERSION_STAMP)
-	$(QUIET)($(foreach FILE,$(wildcard \
-	    $(VBOX_LNX_ADD_INST_STAGE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME)-*.tar.bz2), \
-	    rm $(FILE);))
-	$(QUIET)($(foreach FILE,$(VBOX_LNX_ADD_ARCHIVES), \
-	    cp $(FILE) \
-	    $(VBOX_LNX_ADD_INST_STAGE_DIR)$(subst -r$(VBOX_SVN_REV),,$(notdir $(FILE)));))
+	$(QUIET)$(RM) -f $(foreach file, $(VBOX_LNX_ADD_ARCHIVES), $(VBOX_LNX_ADD_INST_STAGE_DIR)$(subst -r$(VBOX_SVN_REV),,$(notdir $(file))))
+	$(QUIET)$(foreach file, $(VBOX_LNX_ADD_ARCHIVES), \
+		$(CP) -f $(file) $(VBOX_LNX_ADD_INST_STAGE_DIR)$(subst -r$(VBOX_SVN_REV),,$(notdir $(file)))$(NLTAB) )
 	$(QUIET)$(VBOX_MAKESELF) --nocomp $(VBOX_LNX_ADD_INST_STAGE_DIR) $@ \
 		"VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux" \