summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-17 07:14:10 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-17 07:14:10 -0500
commitb6ccccbc56bc040f0c1585e12b329b665624f754 (patch)
treeee4419b304dac7343ba162e663b2f71beb8b96b1 /toolkit
parente14ebc03e3e3101a6e2aba0ec7cffdb538d1e155 (diff)
downloadUXP-b6ccccbc56bc040f0c1585e12b329b665624f754.tar
UXP-b6ccccbc56bc040f0c1585e12b329b665624f754.tar.gz
UXP-b6ccccbc56bc040f0c1585e12b329b665624f754.tar.lz
UXP-b6ccccbc56bc040f0c1585e12b329b665624f754.tar.xz
UXP-b6ccccbc56bc040f0c1585e12b329b665624f754.zip
Put generated installers and mar files in dist root
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/installer/package-name.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index 54de3c995..09ec7108e 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -65,17 +65,17 @@ endif
ifdef MOZ_SIMPLE_PACKAGE_NAME
PKG_BASENAME := $(MOZ_SIMPLE_PACKAGE_NAME)
else
-PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
+PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(MOZ_PKG_PLATFORM)
endif
PKG_PATH =
SDK_PATH =
PKG_INST_BASENAME = $(PKG_BASENAME).installer
PKG_STUB_BASENAME = $(PKG_BASENAME).installer-stub
-PKG_INST_PATH = install/sea/
+PKG_INST_PATH = $(PKG_PATH)
PKG_UPDATE_BASENAME = $(PKG_BASENAME)
CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME)
MOZ_INFO_BASENAME = $(PKG_BASENAME)
-PKG_UPDATE_PATH = update/
+PKG_UPDATE_PATH = $(PKG_PATH)
COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
# PARTIAL_MAR needs to be processed by $(wildcard) before you use it.
PARTIAL_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).partial.*.mar