From 004e9d310009ca8999c99bf4023738e894753ab3 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Mon, 16 Dec 2019 22:58:40 -0800
Subject: build langpacks when using UXP packager

---
 build.mk              |  5 ++++-
 installer/Makefile.in | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build.mk b/build.mk
index c19e65d..62f25ce 100644
--- a/build.mk
+++ b/build.mk
@@ -8,8 +8,11 @@ installer:
 package:
 	@$(MAKE) -C application/webbrowser/installer make-archive
 
+l10n-package:
+	@$(MAKE) -C application/webbrowser/installer make-langpack
+
 mozpackage:
-	@$(MAKE) -C application/webbrowser/installer make-package
+	@$(MAKE) -C application/webbrowser/installer
 
 package-compare:
 	@$(MAKE) -C application/webbrowser/installer package-compare
diff --git a/installer/Makefile.in b/installer/Makefile.in
index c02cdf9..22d4679 100644
--- a/installer/Makefile.in
+++ b/installer/Makefile.in
@@ -156,9 +156,16 @@ endif
 endif
 endif
 
+# Builds using the hybrid FasterMake/RecursiveMake backend will
+# fail to produce a langpack. see PaleMoon bug 1255096
+make-langpack:
+ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
+	$(MAKE) -C $(DEPTH)/application/webbrowser/locales langpack
+else
+	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
+endif
 
-libs::
-	$(MAKE) -C $(DEPTH)/application/palemoon/locales langpack
+libs:: make-langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =
-- 
cgit v1.2.3