From d5b2f96f4448e7b1e0dcd8d34ac09f494c7aa30c Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Mon, 19 Jun 2023 08:12:10 +0100
Subject: [PATCH] Remove separate PARALLEL_MAKEFLAGS variable

---
 Makefile.am  | 2 --
 configure.ac | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8852d50d..f82fee6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,6 @@ AM_CFLAGS += \
 	$(libzstd_CFLAGS) \
 	$(TCL_CFLAGS)
 
-AM_MAKEFLAGS = $(PARALLEL_MAKEFLAGS)
-
 bin_PROGRAMS =
 noinst_LIBRARIES =
 include_HEADERS =
diff --git a/configure.ac b/configure.ac
index 0373866d..e7b50a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,7 +448,6 @@ AX_CHECK_GNU_MAKE
 if test x$_cv_have_gnu_make = xyes ; then
   MAKEFLAGS='$(if $(V),,-s)'
 fi
-AC_SUBST(MAKEFLAGS)
 
 AC_ARG_ENABLE([parallel_make],
               [AS_HELP_STRING([--enable-parallel-make],
@@ -457,15 +456,15 @@ AC_ARG_ENABLE([parallel_make],
               [parallel_make=no])
 
 # Build with make -j by default but only if requested
-PARALLEL_MAKEFLAGS=
 if test x$parallel_make = xyes; then
   AC_MSG_CHECKING([whether to enable parallel make by default])
   AX_COMPARE_VERSION([$ax_check_gnu_make_version], [ge], [4,0],
                      [AC_MSG_RESULT([yes])
-                      PARALLEL_MAKEFLAGS="-j"],
+                      AX_APPEND_FLAG([-j], [MAKEFLAGS])],
                      [AC_MSG_RESULT([no])])
 fi
-AC_SUBST(PARALLEL_MAKEFLAGS)
+
+AC_SUBST(MAKEFLAGS)
 
 # Optional code coverage statistics
 AC_ARG_ENABLE([gcov],
-- 
2.39.2