diff options
Diffstat (limited to 'application/palemoon/installer')
| -rw-r--r-- | application/palemoon/installer/Makefile.in | 13 | ||||
| -rw-r--r-- | application/palemoon/installer/package-manifest.in | 7 |
2 files changed, 17 insertions, 3 deletions
diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index a0c38f282..b3c4cdaba 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -109,7 +109,7 @@ INSTALL_SDK = 1 endif include $(topsrcdir)/toolkit/mozapps/installer/signing.mk -include $(topsrcdir)/toolkit/mozapps/installer/packager.mk +include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk ifeq (bundle, $(MOZ_FS_LAYOUT)) BINPATH = $(_BINPATH) @@ -156,9 +156,16 @@ endif endif endif - -libs:: +# Builds using the hybrid FasterMake/RecursiveMake backend will +# fail to produce a langpack. See bug 1255096. +make-langpack: +ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) $(MAKE) -C $(DEPTH)/application/palemoon/locales langpack +else + @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 +endif + +libs:: make-langpack ifeq (WINNT,$(OS_ARCH)) PKGCOMP_FIND_OPTS = diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index f95f18f77..e24b605e8 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -296,6 +296,13 @@ #ifndef MOZ_SYSTEM_NSS #if defined(XP_LINUX) && !defined(ANDROID) @BINPATH@/@DLL_PREFIX@freeblpriv3@DLL_SUFFIX@ +#elif defined(XP_SOLARIS) && defined(SPARC64) +@BINPATH@/@DLL_PREFIX@freebl_64fpu_3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@freebl_64int_3@DLL_SUFFIX@ +#elif defined(XP_SOLARIS) && defined(SPARC) +@BINPATH@/@DLL_PREFIX@freebl_32fpu_3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@freebl_32int64_3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ #else @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ #endif |