зеркало из https://github.com/mozilla/pjs.git
328391 .mar generation should package universal build when the build is universal. r=darin
This commit is contained in:
Родитель
608c8c3c05
Коммит
860813be6b
|
@ -50,7 +50,11 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||||
STAGE_DIR = $(DIST)/update
|
STAGE_DIR = $(DIST)/update
|
||||||
|
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
ifdef UNIVERSAL_BINARY
|
||||||
|
PACKAGE_DIR = $(DIST)/universal/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
|
||||||
|
else
|
||||||
PACKAGE_DIR = $(DIST)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
|
PACKAGE_DIR = $(DIST)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
PACKAGE_DIR = $(DIST)/$(MOZ_PKG_APPNAME)
|
PACKAGE_DIR = $(DIST)/$(MOZ_PKG_APPNAME)
|
||||||
endif
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче