--- a/src/build-gettext.mk	Tue Sep 07 15:33:58 2021 -0400
+++ b/src/build-gettext.mk	Fri Sep 10 15:34:26 2021 -0400
@@ -17,28 +17,19 @@
     tail -1
 endef
 
+## See
+##
+## https://octave.discourse.group/t/octave-space-fails-to-build-gnutls/1573/19
+##
+## for a discussion about the CCACHE_NODIRECT setting below.
+
 define $(PKG)_BUILD
-    mkdir '$(1)/gettext-runtime/.build'
-    cd    '$(1)/gettext-runtime/.build' && '$(1)/gettext-runtime/configure' \
+    mkdir '$(1).build'
+    cd    '$(1).build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --without-libexpat-prefix \
         --without-libxml2-prefix \
 	$($(PKG)_CONFIGURE_OPTIONS)
-    $(MAKE) -C '$(1)/gettext-runtime/.build/intl' -j $(JOBS)
-    if test x$(MXE_SYSTEM) = xmsvc; then \
-        cd '$(1)/gettext-runtime/.build/intl' && $(CONFIGURE_POST_HOOK); \
-    fi
-    $(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)'
+    CCACHE_NODIRECT=1 $(MAKE) -C '$(1).build' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j 1 $(MXE_DISABLE_DOCS) install DESTDIR='$(3)'
 endef