# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1631040499 14400
# Node ID 0d1af1b88257b20f752370710bc69e3712bb03a0
# Parent  61d6b59e649063c07b24785e73d64093b66526fd# Parent  0e80767f21999b665ed40c38c82775f11a826679
maint: merge release to default.

diff -r 61d6b59e6490 -r 0d1af1b88257 src/build-gettext.mk
--- a/src/build-gettext.mk	Tue Sep 07 14:31:33 2021 -0400
+++ b/src/build-gettext.mk	Tue Sep 07 14:48:19 2021 -0400
@@ -17,6 +17,8 @@
     tail -1
 endef
 
+## Use -j 1 instead of -j $(JOBS) to avoid failures with parallel builds.
+
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
@@ -24,7 +26,7 @@
         --without-libexpat-prefix \
         --without-libxml2-prefix \
 	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1
     if test x$(MXE_SYSTEM) = xmsvc; then \
         cd '$(1).build' && $(CONFIGURE_POST_HOOK); \
     fi
diff -r 61d6b59e6490 -r 0d1af1b88257 src/gettext.mk
--- a/src/gettext.mk	Tue Sep 07 14:31:33 2021 -0400
+++ b/src/gettext.mk	Tue Sep 07 14:48:19 2021 -0400
@@ -18,8 +18,6 @@
     head -1
 endef
 
-## Use -j 1 instead of -j $(JOBS) to avoid failures with parallel builds.
-
 define $(PKG)_BUILD
     cd '$(1)/gettext-runtime' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
@@ -29,7 +27,7 @@
         --without-libexpat-prefix \
         --without-libxml2-prefix \
         CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1
+    $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' 
     $(MAKE) -C '$(1)/gettext-runtime/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 
     cd '$(1)/gettext-tools' && ./configure \
@@ -41,7 +39,7 @@
         --without-libxml2-prefix \
         $(if $(filter msvc,$(MXE_SYSTEM)),ac_cv_func_memset=yes) \
         CONFIG_SHELL=$(SHELL) && $(CONFIGURE_POST_HOOK)
-     $(MAKE) -C '$(1)/gettext-tools/intl' -j 1
+     $(MAKE) -C '$(1)/gettext-tools/intl' -j '$(JOBS)' 
      $(MAKE) -C '$(1)/gettext-tools/intl' -j 1 install DESTDIR='$(3)' $(MXE_DISABLE_DOCS) bin_PROGRAMS=
      if [ "$(ENABLE_DEP_DOCS)" == "no" ]; then \
        rm -rf $(3)$(HOST_PREFIX)/share/doc/$(PKG); \