# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1631043328 14400
# Node ID 7bc0af5b2c9a32f6cdad5d39cd29893b68ddcd84
# Parent  0d1af1b88257b20f752370710bc69e3712bb03a0# Parent  c30da1cd5e3bbc76f99d27da1fd03eaf43d1a64d
maint: merge release to default.

diff -r 0d1af1b88257 -r 7bc0af5b2c9a src/build-gettext.mk
--- a/src/build-gettext.mk	Tue Sep 07 14:48:19 2021 -0400
+++ b/src/build-gettext.mk	Tue Sep 07 15:35:28 2021 -0400
@@ -17,18 +17,28 @@
     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' \
+    mkdir '$(1)/gettext-runtime/.build'
+    cd    '$(1)/gettext-runtime/.build' && '$(1)/gettext-runtime/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --without-libexpat-prefix \
         --without-libxml2-prefix \
 	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1).build' -j 1
+    $(MAKE) -C '$(1)/gettext-runtime/.build/intl' -j $(JOBS)
     if test x$(MXE_SYSTEM) = xmsvc; then \
-        cd '$(1).build' && $(CONFIGURE_POST_HOOK); \
+        cd '$(1)/gettext-runtime/.build/intl' && $(CONFIGURE_POST_HOOK); \
     fi
-    $(MAKE) -C '$(1).build' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/gettext-runtime/.build/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
+
+    mkdir '$(1)/gettext-tools/.build'
+    cd    '$(1)/gettext-tools/.build' && '$(1)/gettext-tools/configure' \
+        --prefix='$(BUILD_TOOLS_PREFIX)' \
+        --without-libexpat-prefix \
+        --without-libxml2-prefix \
+	$($(PKG)_CONFIGURE_OPTIONS)
+    $(MAKE) -C '$(1)/gettext-tools/.build/intl' -j $(JOBS)
+    if test x$(MXE_SYSTEM) = xmsvc; then \
+        cd '$(1)/gettext-tools/.build/intl' && $(CONFIGURE_POST_HOOK); \
+    fi
+    $(MAKE) -C '$(1)/gettext-tools/.build/intl' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 endef