From c51a373fdde3bc0cdce723c18a4fdd9d90e24966 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 22 Sep 2009 13:17:17 +0200 Subject: improve guessing of common license - update src/xpi.mk --- src/xpi.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/xpi.mk') diff --git a/src/xpi.mk b/src/xpi.mk index 570e124..3e2ed2c 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -153,8 +153,6 @@ MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; -MOZ_XPI_DOCUMENTED_LICENSE_FILES ?= $(strip $(shell find * -iname copying -o -iname licen[cs]e -o -iname licen[cs]e.txt)) - ALL_XPI_RECOMMENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \ $(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package))))) @@ -205,6 +203,9 @@ ifneq (,$(MOZ_XPI_DOCUMENTED_LICENSE_FILES)) unzip -o -d $(TEMPDIR) $(XPI_DIR)$* -x $(MOZ_XPI_DOCUMENTED_LICENSE_FILES) else unzip -o -d $(TEMPDIR) $(XPI_DIR)$* +ifeq ($(origin MOZ_XPI_DOCUMENTED_LICENSE_FILES),undefined) + cd $(TEMPDIR) && find \( -iname copying -o -iname licen[cs]e -o -iname licen[cs]e.txt \) -printf "xpi.mk: deleted %p\n" -delete +endif endif touch $@ -- cgit v1.2.3