diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
commit | 5839763c827cc35973e419026f926e9b8ffc118d (patch) | |
tree | 11fd29c791adc491430a7a9b516224c2a724868e /toolkit/locales/l10n.mk | |
parent | 83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff) | |
parent | 45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff) | |
download | UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip |
Merge branch 'master' into ported-moebius
# Conflicts:
# browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'toolkit/locales/l10n.mk')
-rw-r--r-- | toolkit/locales/l10n.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk index c3d47d163..34d78d33c 100644 --- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -112,10 +112,6 @@ repackage-zip: UNPACKAGE='$(ZIP_IN)' repackage-zip: libs-$(AB_CD) # call a hook for apps to put their uninstall helper.exe into the package $(UNINSTALLER_PACKAGE_HOOK) -# call a hook for apps to build the stub installer -ifdef MOZ_STUB_INSTALLER - $(STUB_HOOK) -endif $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \ $(MOZ_PKG_EXTRAL10N) \ $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) |