patches/texinfo{,_host}-6.7.local.patch: added.

midipix.env:${DEFAULT_{CROSS,HOST,NATIVE}_MAKE}: default to make.
subr/pkg_{build,install}.subr: honour ${PKG_MAKE}.
subr/pkg_build.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_MAKE} if non-zero and not "none".
subr/pkg_configure.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_CONFIGURE} if non-zero and not "none".
subr/pkg_install_make.subr: export "make LIBTOOL=${PKG_LIBTOOL}" during ${PKG_MAKE} if non-zero and not "none".

6 files changed, 56 insertions, 14 deletions

diff --git a/midipix.env b/midipix.env
index 27909456..7a1ebb45 100644
--- a/midipix.env
+++ b/midipix.env
@@ -136,13 +136,13 @@ https://midipix.lucioillanes.de/repos_git/
 : ${DEFAULT_CROSS_CC:=${DEFAULT_TARGET}-gcc};
 : ${DEFAULT_CROSS_CXX:=${DEFAULT_TARGET}-g++};
 : ${DEFAULT_CROSS_LIBTOOL:=slibtool};
-: ${DEFAULT_CROSS_MAKE:=make LIBTOOL=slibtool};
+: ${DEFAULT_CROSS_MAKE:=make};
 : ${DEFAULT_CROSS_RANLIB:=${DEFAULT_TARGET}-ranlib};
 : ${DEFAULT_HOST_AR:=ar};
 : ${DEFAULT_HOST_CC:=gcc};
 : ${DEFAULT_HOST_CXX:=g++};
 : ${DEFAULT_HOST_LIBTOOL:=slibtool};
-: ${DEFAULT_HOST_MAKE:=make LIBTOOL=slibtool};
+: ${DEFAULT_HOST_MAKE:=make};
 : ${DEFAULT_HOST_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
 : ${DEFAULT_HOST_PKG_CONFIG_LIBDIR:=${PREFIX}/lib/pkgconfig};
 : ${DEFAULT_HOST_RANLIB:=ranlib};
@@ -150,7 +150,7 @@ https://midipix.lucioillanes.de/repos_git/
 : ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc};
 : ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++};
 : ${DEFAULT_NATIVE_LIBTOOL:=slibtool};
-: ${DEFAULT_NATIVE_MAKE:=make LIBTOOL=slibtool};
+: ${DEFAULT_NATIVE_MAKE:=make};
 : ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
 : ${DEFAULT_NATIVE_PKG_CONFIG_LIBDIR:=${PREFIX}/lib/pkgconfig};
 : ${DEFAULT_NATIVE_RANLIB:=${DEFAULT_TARGET}-ranlib};
diff --git a/patches/texinfo-6.7.local.patch b/patches/texinfo-6.7.local.patch
new file mode 100644
index 00000000..27ddb394
--- /dev/null
+++ b/patches/texinfo-6.7.local.patch
@@ -0,0 +1,22 @@
+--- texinfo-6.7/configure.orig	2019-09-23 19:32:14.000000000 +0100
++++ texinfo-6.7/configure	2021-05-06 10:54:06.366315956 +0100
+@@ -21923,7 +21923,7 @@
+   # env -i gives this build host configure a clean environment;
+   # consequently, we have to re-initialize $PATH.
+   env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
+-      PATH="$PATH" \
++      PATH="$PATH" ${MAKE:+MAKE="$MAKE"} \
+       tools_only=1 \
+     ${confdir}/configure --build=${build} --host=${build} \
+                          --disable-rpath --disable-nls
+@@ -23859,8 +23859,8 @@
+ $as_echo "" >&6; }
+   enable_xs=no
+   (cd tp/Texinfo/XS \
+-   && make clean \
+-   && make TestXS.la \
++   && ${MAKE:-make} clean \
++   && ${MAKE:-make} TestXS.la \
+    && TEXINFO_XS=debug ; export TEXINFO_XS \
+    && ${PERL} -I . \
+               -I ${xs_srcdir} \
diff --git a/patches/texinfo_host-6.7.local.patch b/patches/texinfo_host-6.7.local.patch
new file mode 120000
index 00000000..a17dc14f
--- /dev/null
+++ b/patches/texinfo_host-6.7.local.patch
@@ -0,0 +1 @@
+texinfo-6.7.local.patch
\ No newline at end of file
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr
index 327edae2..1c6712f7 100644
--- a/subr/pkg_build.subr
+++ b/subr/pkg_build.subr
@@ -3,7 +3,7 @@
 #
 
 pkg_build() {
-	local _libtool="" _makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}" _no_autoconf="" _subdir="";
+	local _libtool="" _makeflags_verbosity="${PKG_MAKEFLAGS_VERBOSITY:-none}" _no_autoconf="" _rc=0 _subdir="";
 	case "${PKG_LIBTOOL:-}" in
 	"")	_libtool=""; ;;
 	none)	_libtool=""; ;;
@@ -19,10 +19,13 @@ pkg_build() {
 		if [ "${_subdir}" = ":" ]; then
 			_subdir="";
 		fi;
+		if [ "${#_libtool}" -gt 0 ]; then
+			export MAKE="make LIBTOOL=${_libtool}";
+		fi;
 		# N.B.	We only specify CC= here if the current package does not use GNU
 		#	autoconf as it often abuses it by appending -std={gnu99,...} to it
 		#	instead of amending CFLAGS.
-		rtl_run_cmd_unsplit make							\
+		rtl_run_cmd_unsplit "${PKG_MAKE}"						\
 			${PKG_MAKEFLAGS_BUILD:-}						\
 			${PKG_MAKEFLAGS_BUILD_EXTRA:-}						\
 			"AR=${PKG_AR}" "${_no_autoconf:+CC=${PKG_CC}}" "RANLIB=${PKG_RANLIB}"	\
@@ -38,8 +41,11 @@ pkg_build() {
 			"${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}"	\
 			${_libtool:+"LIBTOOL=${_libtool}"}					\
 			${_makeflags_verbosity}							\
-			${_subdir:+-C "${_subdir}"};
-		if [ "${?}" -ne 0 ]; then
+			${_subdir:+-C "${_subdir}"}; _rc="${?}";
+		if [ "${#_libtool}" -gt 0 ]; then
+			unset MAKE;
+		fi;
+		if [ "${_rc}" -ne 0 ]; then
 			return 1;
 		fi;
 	done;
diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr
index 39f5dbf0..c57b342b 100644
--- a/subr/pkg_configure.subr
+++ b/subr/pkg_configure.subr
@@ -3,12 +3,18 @@
 #
 
 pkg_configure() {
-	local _rc=0;
+	local _libtool="" _rc=0;
 	if [ -x "${PKG_CONFIGURE:-}" ]; then
+		case "${PKG_LIBTOOL:-}" in
+		"")	_libtool=""; ;;
+		none)	_libtool=""; ;;
+		*)	_libtool="${PKG_LIBTOOL}"; ;;
+		esac;
 		rtl_export_vars	\
 			PKG_CONFIG "${PKG_PKG_CONFIG:-}"								\
 			PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"							\
-			PYTHON "${PKG_PYTHON:-}";
+			PYTHON "${PKG_PYTHON:-}"									\
+			${_libtool:+MAKE} ${_libtool:+"make LIBTOOL=${_libtool}"};
 		AR="${PKG_AR}"												\
 		CC="${PKG_CC}"												\
 		RANLIB="${PKG_RANLIB}"											\
@@ -21,7 +27,8 @@ pkg_configure() {
 		rtl_export_vars	-u \
 			PKG_CONFIG "${PKG_PKG_CONFIG:-}"								\
 			PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}"							\
-			PYTHON "${PKG_PYTHON:-}";
+			PYTHON "${PKG_PYTHON:-}"									\
+			${_libtool:+MAKE} ${_libtool:+"make LIBTOOL=${_libtool}"};
 		return "${_rc}";
 	fi;
 };
diff --git a/subr/pkg_install_make.subr b/subr/pkg_install_make.subr
index 2afcb7b8..f7ac4640 100644
--- a/subr/pkg_install_make.subr
+++ b/subr/pkg_install_make.subr
@@ -3,7 +3,7 @@
 #
 
 pkg_install_make() {
-	local _libtool="" _subdir="";
+	local _libtool="" _rc=0 _subdir="";
 	case "${PKG_LIBTOOL:-}" in
 	"")	_libtool=""; ;;
 	none)	_libtool=""; ;;
@@ -13,7 +13,10 @@ pkg_install_make() {
 		if [ "${_subdir}" = ":" ]; then
 			_subdir="";
 		fi;
-		rtl_run_cmd_unsplit make					\
+		if [ "${#_libtool}" -gt 0 ]; then
+			export MAKE="make LIBTOOL=${_libtool}";
+		fi;
+		rtl_run_cmd_unsplit "${PKG_MAKE}"				\
 			${PKG_MAKEFLAGS_INSTALL:-}				\
 			${PKG_MAKEFLAGS_INSTALL_EXTRA:-}			\
 			AR="${PKG_AR}" CC="${PKG_CC}" RANLIB="${PKG_RANLIB}"	\
@@ -21,8 +24,11 @@ pkg_install_make() {
 			${_libtool:+"LIBTOOL=${_libtool}"}			\
 			"${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/"	\
 			${PKG_INSTALL_TARGET:-install}				\
-			${_subdir:+-C "${_subdir}"};
-		if [ "${?}" -ne 0 ]; then
+			${_subdir:+-C "${_subdir}"}; _rc="${?}";
+		if [ "${#_libtool}" -gt 0 ]; then
+			unset MAKE;
+		fi;
+		if [ "${_rc}" -ne 0 ]; then
 			return 1;
 		fi;
 	done;