diff options
| author | ru <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
| commit | 1a085bedc04ce216032d93ffecd05d19b8bd8809 (patch) | |
| tree | fa2a90269f4179b941a6484b35b48413f6a30c7f /share/mk/bsd.info.mk | |
| parent | e42e586ab2472f8243ec162166258ea136f30ce7 (diff) | |
| download | FreeBSD-src-1a085bedc04ce216032d93ffecd05d19b8bd8809.zip FreeBSD-src-1a085bedc04ce216032d93ffecd05d19b8bd8809.tar.gz | |
Merge bsd.obj.mk's version of the _SUBDIR target with bsd.subdir.mk.
Ensure all standard targets honor SUBDIR. Now `make obj' descends into
SUBDIRs even if NOOBJ is set (some descendants may still need an object
directory, but we do not have such precedents). Now `make install' in
non-bsd.subdir.mk makefiles runs `afterinstall' target _after_ `install'
in SUBDIRs, like we do in bsd.subdir.mk. Nothing depended on the wrong
order anyway.
Fixed `distribute' targets (except for the bsd.subdir.mk version) so that
they do not depend on _SUBDIR; `distribute' calls `install' which already
depends on _SUBDIR.
De-standardize `maninstall', otherwise manpages would be installed twice.
(To be revised later.)
Diffstat (limited to 'share/mk/bsd.info.mk')
| -rw-r--r-- | share/mk/bsd.info.mk | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index b800e89..d4f3790 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -72,9 +72,6 @@ # install: # Install the info files. # -# maninstall: -# Dummy target, do nothing. -# # # bsd.obj.mk: cleandir and obj @@ -137,10 +134,10 @@ CLEANFILES+= ${IFILENS} .if !defined(NOINFOCOMPRESS) CLEANFILES+= ${IFILENS:S/$/${ICOMPRESS_EXT}/} IFILES= ${IFILENS:S/$/${ICOMPRESS_EXT}/:S/.html${ICOMPRESS_EXT}/.html/} -all: ${IFILES} _SUBDIR +all: ${IFILES} .else IFILES= ${IFILENS} -all: ${IFILES} _SUBDIR +all: ${IFILES} .endif .else all: @@ -165,7 +162,7 @@ ${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE} DISTRIBUTION?= bin .if !target(distribute) -distribute: _SUBDIR +distribute: .for dist in ${DISTRIBUTION} cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies .endfor @@ -190,7 +187,7 @@ CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/} .endif .if !defined(NOINFO) && defined(INFO) -install: ${INSTALLINFODIRS} _SUBDIR +install: ${INSTALLINFODIRS} .if ${IFILES:N*.html} ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ ${IFILES:N*.html} ${DESTDIR}${INFODIR} @@ -208,16 +205,4 @@ install: __null_install __null_install: .endif -.if !target(all-man) -all-man: _SUBDIR -.endif - -.if !target(maninstall) -maninstall: _SUBDIR -.endif - -.if !target(regress) -regress: -.endif - .include <bsd.obj.mk> |
