diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-04-23 09:03:56 +0000 |
| commit | b25a566d47d2f34c5bfed6e032e0531f8c5bad30 (patch) | |
| tree | fa2a90269f4179b941a6484b35b48413f6a30c7f /share/mk/bsd.nls.mk | |
| parent | c1deb99469b371e622f1fd021a6919b0cc4605e4 (diff) | |
| download | src-b25a566d47d2f34c5bfed6e032e0531f8c5bad30.tar.gz src-b25a566d47d2f34c5bfed6e032e0531f8c5bad30.zip | |
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.)
Notes
Notes:
svn path=/head/; revision=95306
Diffstat (limited to 'share/mk/bsd.nls.mk')
| -rw-r--r-- | share/mk/bsd.nls.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk index 76da8e1dce74..c7ed6dafa43f 100644 --- a/share/mk/bsd.nls.mk +++ b/share/mk/bsd.nls.mk @@ -114,17 +114,9 @@ realinstall: beforeinstall nlsinstall links-nls realinstall: beforeinstall .endif -all: all-nls _SUBDIR +all: all-nls install: realinstall afterinstall -.if !target(all-man) -all-man: _SUBDIR -.endif - -.if !target(maninstall) -maninstall: _SUBDIR -.endif - DISTRIBUTION?= bin .if !target(distribute) distribute: |