diff options
| author | peter <peter@FreeBSD.org> | 1997-01-12 07:05:07 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1997-01-12 07:05:07 +0000 |
| commit | 37d72f4be97fbcc4614c223d43b819204db55084 (patch) | |
| tree | c7a32ed764d6777b86c7aba5ab33870e18e422d1 | |
| parent | b1ad1fd1a75f3132597c45027836c895baa266e0 (diff) | |
| download | FreeBSD-src-37d72f4be97fbcc4614c223d43b819204db55084.zip FreeBSD-src-37d72f4be97fbcc4614c223d43b819204db55084.tar.gz | |
recover spammed revisions 1.20 and 1.21. This fixes the breaks in the
builds when INFO is commented out.
Pointed out by: bde
| -rw-r--r-- | share/mk/bsd.info.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 2f168ac..f1398c8 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -1,9 +1,8 @@ -# $Id: bsd.info.mk,v 1.19 1996/09/03 15:14:45 bde Exp $ +# $Id: bsd.info.mk,v 1.23 1997/01/11 10:51:36 jmacd Exp $ -BINMODE= 444 -BINDIR?= /usr/share/info MAKEINFO?= makeinfo MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression +SRCDIR?= ${.CURDIR} INFODIRFILE?= dir INFOTMPL?= /usr/share/info/dir-tmpl INSTALLINFO?= install-info @@ -13,11 +12,11 @@ INFOSECTION?= Miscellaneous .SUFFIXES: .gz .info .texi .texinfo .texi.info: - ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} ${.IMPSRC} -o ${.TARGET} + ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} -I ${SRCDIR} ${.IMPSRC} -o ${.TARGET} .texinfo.info: - ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} ${.IMPSRC} -o ${.TARGET} + ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} -I ${SRCDIR} ${.IMPSRC} -o ${.TARGET} -.PATH: ${.CURDIR} +.PATH: ${.CURDIR} ${SRCDIR} IFILENS= ${INFO:S/$/.info/g} @@ -63,7 +62,7 @@ distribute: _SUBDIR .if defined(SRCS) ${INFO}.info: ${SRCS} - ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} ${SRCS:S/^/${.CURDIR}\//g} -o ${INFO}.info + ${MAKEINFO} ${MAKEINFOFLAGS} -I ${.CURDIR} -I ${SRCDIR} ${SRCS:S/^/${SRCDIR}\//g} -o ${INFO}.info .endif depend: _SUBDIR @@ -74,8 +73,8 @@ clean: _SUBDIR .if !defined(NOINFO) install: ${INSTALLINFODIRS} _SUBDIR - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${IFILES} ${DESTDIR}${BINDIR} + ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ + ${IFILES} ${DESTDIR}${INFODIR} .else install: .endif |
