diff --git a/Makefile.inc1 b/Makefile.inc1 index d60cb8654a0..6c77c8abdb8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -887,8 +887,8 @@ MTREEFLAGS+= -W INSTALLFLAGS+= -h sha256 .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) -IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" -IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" +IMAKE_INSTALL= INSTALL="${INSTALL} ${INSTALLFLAGS}" +IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" .endif DESTDIR_MTREEFLAGS= -deU diff --git a/etc/Makefile b/etc/Makefile index a90fa768ac4..7ee9eca7eb1 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -6,6 +6,7 @@ FILESGROUPS= FILES NLS_ALIASES= POSIX C \ en_US.US_ASCII C +PWD_MKDB_CMD?= pwd_mkdb # No need as it is empty and just causes rebuilds since this file does so much. UPDATE_DEPENDFILE= no diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 1685d3e85fc..33aa0bcba98 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -22,6 +22,8 @@ # They have to be listed here so we can build modules outside of the # src tree. +KLDXREF_CMD?= kldxref + __DEFAULT_YES_OPTIONS = \ AUTOFS \ BHYVE \ diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index f09937beb88..665151e2a6e 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -348,8 +348,8 @@ afterinstall: _kldxref .ORDER: _installlinks _kldxref _kldxref: .PHONY @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ - kldxref ${DESTDIR}${KMODDIR}; \ + ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ fi .endif .endif # !target(realinstall) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 396d3e3f722..bf05a936dcd 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -795,8 +795,8 @@ SUBDIR:= ${SUBDIR:N${reject}} .MAKEFLAGS+= -DNO_XREF afterinstall: .PHONY @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} kldxref ${DESTDIR}${KMODDIR}; \ - kldxref ${DESTDIR}${KMODDIR}; \ + ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ fi .endif diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index af83c970cc1..be29e8c0585 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -8,6 +8,7 @@ PROG= login SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL LIBADD= util pam +CAP_MKDB_CMD?= cap_mkdb WARNS?= 5 @@ -25,7 +26,7 @@ PRECIOUSPROG= .include afterinstallconfig: - cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf + ${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf .if defined(NO_ROOT) && defined(METALOG) echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel" | \ cat -l >> ${METALOG} diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile index e1553b674b9..a25ab3cd883 100644 --- a/usr.sbin/services_mkdb/Makefile +++ b/usr.sbin/services_mkdb/Makefile @@ -4,12 +4,13 @@ CONFS= services PROG= services_mkdb MAN= services_mkdb.8 SRCS= services_mkdb.c uniq.c extern.h +SERVICES_MKDB_CMD?= ${PROG} .include .include .if ${MK_SERVICESDB} != "no" afterinstallconfig: - services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ + ${SERVICES_MKDB_CMD} ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \ ${DESTDIR}/etc/services .if defined(NO_ROOT) && defined(METALOG) echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel" | \