From a7fbec92ae2200163d1c2675e99b712d6aac8d80 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Tue, 22 Sep 2009 17:20:01 +0200 Subject: improve lib_share_dir - update src/xpi.mk --- src/xpi.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xpi.mk b/src/xpi.mk index 6511fac..edbb411 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -151,7 +151,7 @@ CHECK_VERSION = $(shell \ MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | sed "s/^Package://")) -MOZ_XPI_ARCH := $(strip $(shell egrep '^Package:|^Architecture:' debian/control | grep -A1 '^Package:[ \t]*$(MOZ_EXTENSION_PKG)$$' | grep ^Architecture: | sed -e 's/Architecture://')) +MOZ_XPI_ARCH := $(strip $(shell egrep '^Package:|^Architecture:' debian/control | grep -A1 '^Package:[ \t]*$(MOZ_EXTENSION_PKG)[ \t]*$$' | grep ^Architecture: | sed -e 's/Architecture://')) MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; @@ -224,7 +224,7 @@ installlinks-%-stamp: unzip-$(XPI_BASE_FILE)-stamp touch $@ autolinks-stamp: unzip-$(XPI_BASE_FILE)-stamp $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),installlinks-$(mozilla)-stamp) - $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)),dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/mozilla/extensions/$(id)/$(call XPI_EMID,$(TEMPDIR));) + $(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 $@ install-%-stamp: unzip-%-stamp -- cgit v1.2.3