diff options
| author | Benjamin Drung <bdrung@ubuntu.com> | 2009-10-06 01:48:48 +0200 |
|---|---|---|
| committer | Benjamin Drung <bdrung@ubuntu.com> | 2009-10-06 01:48:48 +0200 |
| commit | 38d5329427da7c882fc3aa1c8e5f47590907f6ac (patch) | |
| tree | 2821a1707ae6a78ee143b13587a6d6ac0996e713 /src | |
| parent | de9dc661a4f4ad7437e6b8b7b7e4ca62b37a4adc (diff) | |
* xpi.mk:
- Fail to build, if no xpi file is found.
- update src/xpi.mk
Diffstat (limited to 'src')
| -rw-r--r-- | src/xpi.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -195,7 +195,7 @@ XPI_EMID = $(sort $(shell xpath -q -e '/node()/Description/em:id/text() | //RDF: endif ifeq (,$(MOZ_XPI_DISABLE_AUTOLINKS)) -RDF_RESOURCES = $(shell xpath -q -e '//em:targetApplication/@RDF:resource' $(1)/install.rdf | sed -e 's/.*="\(.*\)"/\1/') +RDF_RESOURCES = $(shell xpath -q -e '//em:targetApplication/@RDF:resource' $(1)/install.rdf 2>/dev/null | sed -e 's/.*="\(.*\)"/\1/') XPI_TARGET_EMIDs = \ $(shell xpath -q -e '//em:targetApplication//@em:id' $(1)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/') \ @@ -243,6 +243,9 @@ installlinks-%-stamp: $(patsubst %,unzip-%-stamp,$(XPI_BASE_FILE)) touch $@ autolinks-stamp: $(patsubst %,unzip-%-stamp,$(XPI_BASE_FILE)) $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),installlinks-$(mozilla)-stamp) + $(if $(XPI_FILE),,@echo "xpi.mk: No xpi file found. Did you create one?"; \ + echo "xpi.mk: Please check MOZ_XPI_BUILD_COMMAND and maybe MOZ_XPI_FILE!"; \ + exit 2) $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)),dh_link -p$(MOZ_EXTENSION_PKG) /usr/$(lib_share_dir)/$(MOZ_EXTENSION_PKG) /usr/lib/mozilla/extensions/$(id)/$(call XPI_EMID,$(TEMPDIR));) touch $@ |