- make MOZ_EXTENSION_PKG optional; if this variable is unset, the first

    binary package listed in debian/control will be used
    - update src/xpi.mk

1 files changed, 6 insertions, 2 deletions

diff --git a/src/xpi.mk b/src/xpi.mk
index 820605e..cfe2aaf 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -24,8 +24,10 @@
 # Usage: include this file in your cdbs debian/rules file and define the
 #        following variables:
 #
-#        MOZ_EXTENSION_PKG (MANDATORY):
-#        	define the binary package name used to ship this xpi
+#        MOZ_EXTENSION_PKG (OPTIONAL):
+#        	if defined the given binary package name is used to ship this
+#        	xpi; otherwise the first binary package listed in debian/control
+#        	is used
 #
 #        MOZ_XPI_FILE (OPTIONAL):
 #        	if defined the given .xpi file is used; otherwise we try to
@@ -135,6 +137,8 @@ MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi;
 XPI_DEPENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \
 	$(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package)))))
 
+MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | sed "s/^Package://"))
+
 TEMPDIR := temp-xpi-unpacked
 
 ifneq (,$(MOZ_XPI_FILE))