From 3bfa8cb182347c81ea410f189e9f4611d25de876 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Mon, 7 Apr 1997 16:46:40 +0000 Subject: [PATCH] Include ${CURDIR}/../Makefile.inc as in most other `.mk' files. This is most useful for centralizing the definitions of paths to contrib directories. Removed useless subshell and evil-hiding @ in the the rule for initializing the info dir. --- share/mk/bsd.info.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index ab0bb621c2ca..e174aa29c3ce 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -1,4 +1,4 @@ -# $Id: bsd.info.mk,v 1.34 1997/03/12 07:14:44 peter Exp $ +# $Id: bsd.info.mk,v 1.35 1997/03/29 12:39:52 peter Exp $ # # The include file handles installing GNU (tech)info files. # Texinfo is a documentation system that uses a single source @@ -70,6 +70,10 @@ # # bsd.obj.mk: cleandir and obj +.if exists(${.CURDIR}/../Makefile.inc) +.include "${.CURDIR}/../Makefile.inc" +.endif + MAKEINFO?= makeinfo MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression SRCDIR?= ${.CURDIR} @@ -117,7 +121,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} # What to do if there's no dir file there. This is really gross!!! ${DESTDIR}${INFODIR}/${INFODIRFILE}: - @(cd /usr/src/share/info; make install) + cd /usr/src/share/info; ${MAKE} install .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/}