From 9af8612e8cb6305479291e97f606be48466ff5c8 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 29 Sep 2006 15:36:19 +0000 Subject: [PATCH] Don't run install-info under lockf if not installing in parallel. Requested by: rwatson --- share/mk/bsd.info.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 826231f96a63..9c3220df6355 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -143,11 +143,18 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} ${x:S/$/-install/}: +.if !empty(.MAKEFLAGS:M-j) lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} +.else + ${INSTALLINFO} ${INSTALLINFOFLAGS} \ + --defsection=${INFOSECTION} \ + --defentry=${INFOENTRY_${x}} \ + ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} +.endif .endfor .PHONY: ${INSTALLINFODIRS}