gbranden pushed a commit to branch master
in repository groff.
commit 603daf68446c83af5e6cdc87e6b3b651a7f2e4c2
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Feb 20 12:22:01 2023 -0600
m4/groff.m4 (GROFF_MAKE_DEFINES_RM): Honor $MAKE.
* m4/groff.m4 (GROFF_MAKE_DEFINES_RM): Test the make(1) in the
environment variable $MAKE if defined, instead a literal "make".
Required on (some) Solaris 10 configurations where traditional make(1)
is not installed but GNU make is installed as "gmake".
---
ChangeLog | 7 +++++++
m4/groff.m4 | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index b81c7de49..df4532853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-02-20 G. Branden Robinson <[email protected]>
+
+ * m4/groff.m4 (GROFF_MAKE_DEFINES_RM): Test the make(1) in the
+ environment variable $MAKE if defined, instead a literal "make".
+ Required on (some) Solaris 10 configurations where traditional
+ make(1) is not installed but GNU make is installed as "gmake".
+
2023-02-19 G. Branden Robinson <[email protected]>
* tmac/tests/latin2_works.sh: Fix missing backslash in printf.
diff --git a/m4/groff.m4 b/m4/groff.m4
index fcc676f64..7bb4466a7 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1775,6 +1775,11 @@ AC_DEFUN([GROFF_PROG_XPMTOPPM],
AC_DEFUN([GROFF_MAKE_DEFINES_RM], [
AC_MSG_CHECKING(whether make defines 'RM')
+ make=make
+ if test -n "$MAKE"
+ then
+ make=$MAKE
+ fi
cat <<EOF > test_make_rm.mk
all:
@if test -n "\$(RM)"; \
@@ -1784,7 +1789,7 @@ all:
echo no; \
fi
EOF
- groff_make_defines_rm=`make -sf test_make_rm.mk`
+ groff_make_defines_rm=`"$make" -sf test_make_rm.mk`
AC_MSG_RESULT([$groff_make_defines_rm])
rm -f test_make_rm.mk
])
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
