зеркало из https://github.com/mozilla/pjs.git
read DEB_PKG_NAME from deb_name.txt in repacks. bug 538699, r=pike
This commit is contained in:
Родитель
2741276808
Коммит
ca8e6e95d5
|
@ -64,7 +64,9 @@ PREF_JS_EXPORTS = $(firstword $(wildcard $(LOCALE_SRCDIR)/mobile-l10n.js) \
|
|||
|
||||
# Shouldn't := DEB_BUILD_ARCH despite the $(shell ) as deb isn't everywhere
|
||||
DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||
DEB_PKG_NAME = fennec_$(MOZ_APP_VERSION)_$(DEB_BUILD_ARCH).deb
|
||||
EN_US_BINARY_URL ?= $(error EN_US_BINARY_URL not defined)
|
||||
WGET ?= $(error WGET not installed)
|
||||
DEB_PKG_NAME ?= $(shell $(WGET) -q -O - $(EN_US_BINARY_URL)/deb_name.txt)
|
||||
DATASTAGE = $(CURDIR)/data-stage
|
||||
|
||||
SEARCH_PLUGINS = $(shell cat \
|
||||
|
@ -166,9 +168,6 @@ ident:
|
|||
|
||||
# special targets just to do the debian single locale packages
|
||||
wget-deb:
|
||||
ifndef WGET
|
||||
$(error Wget not installed)
|
||||
endif
|
||||
$(WGET) -nv -N $(EN_US_BINARY_URL)/$(DEB_PKG_NAME)
|
||||
|
||||
$(DATASTAGE): $(DEB_PKG_NAME)
|
||||
|
@ -193,4 +192,4 @@ repackage-deb: $(DATASTAGE)
|
|||
|
||||
deb-%: AB_CD=$*
|
||||
deb-%: clobber-% langpack-%
|
||||
@$(MAKE) repackage-deb AB_CD=$(AB_CD)
|
||||
@$(MAKE) repackage-deb AB_CD=$(AB_CD) DEB_PKG_NAME=$(DEB_PKG_NAME)
|
||||
|
|
Загрузка…
Ссылка в новой задаче