=== modified file 'src/Makefile'
--- src/Makefile	2009-10-06 17:02:53 +0000
+++ src/Makefile	2009-10-07 12:52:20 +0000
@@ -43,12 +43,13 @@
 	mozclient.mk \
 	compare.mk \
 	minefield-packager.mk \
-	xpi.mk \
+	xpi-config.mk \
 	xulapp.mk \
 	$(NULL)
 
 extra_files = \
 	lp-locale-export.mk \
+	xpi.mk \
 	xpi-data-all.mk \
 	xpi-data-common.mk \
 	xpi-data-Debian.mk \

=== renamed file 'src/xpi.mk.in' => 'src/xpi.mk'
--- src/xpi.mk.in	2009-10-06 17:17:25 +0000
+++ src/xpi.mk	2009-10-07 13:05:37 +0000
@@ -82,10 +82,13 @@
 #                to MOZ_XPI_EXT_NAME
 #
 
-MOZ_XPI_DISTRO ?= @DISTRO@
+_xpi_makefile_path ?= /usr/share/mozilla-devscripts
+
+-include $(_xpi_makefile_path)/xpi-config.mk
+
+MOZ_XPI_DISTRO ?= all
 
 # xpi-data-*.mk must define packages_*, *_sol, and *_eol
-_xpi_makefile_path ?= /usr/share/mozilla-devscripts
 include $(_xpi_makefile_path)/xpi-data-$(MOZ_XPI_DISTRO).mk
 
 # data for XPI_RECOMMENDS/CHECK_VERSION magic - targetApplication min-/maxVersions