1 files changed, 5 insertions, 2 deletions
diff --git a/src/xpi.mk b/src/xpi.mk
index 5fb3583..d62dcd2 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -51,7 +51,7 @@
 
 MOZ_XPI_MOZILLA_DIRS ?= firefox-addons firefox
 
-MOZ_XPI_BUILD_COMMAND ?= rm -f `pwd`/*.xpi ; med-xpi-pack `pwd` $(MOZ_EXTENSION_PKG).xpi;
+MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi;
 
 TEMPDIR := $(shell rm -rf temp-xpi-*; mktemp -d temp-xpi-XXXXXXXX)
 
@@ -76,8 +76,11 @@ endif
 
 install/$(MOZ_EXTENSION_PKG):: xpi-install
 
-# clean build
+# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined
 clean:: xpi-clean
+ifneq (,$(MOZ_XPI_BUILD_COMMAND))
+	rm -f *.xpi
+endif
 
 # ### general helper targets
 stamp-unzip-%: