diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-07 15:30:49 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-07 15:30:49 +0000 |
| commit | 8782938772424cb18d29c4ddc078051efe526c93 (patch) | |
| tree | 8fe4dc5751d24fe0c549a2eca7057603f428cc5d /share/mk/bsd.prog.mk | |
| parent | b90dab70f15f9d46fd4e4bd988bd354e891a0d21 (diff) | |
| download | src-8782938772424cb18d29c4ddc078051efe526c93.tar.gz src-8782938772424cb18d29c4ddc078051efe526c93.zip | |
Install PROG before SCRIPTS and FILES, but make sure
LINKS are still processed last. This backs out part
of the backout in previous revision.
Install the manpages before descending into SUBDIRs.
Notes
Notes:
svn path=/head/; revision=96163
Diffstat (limited to 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index ff4b0c1cbc7a..d90851a3fed7 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -104,7 +104,8 @@ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor .if !target(realinstall) -realinstall: +realinstall: _proginstall +_proginstall: .if defined(PROG) .if defined(PROGNAME) ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ @@ -118,6 +119,8 @@ realinstall: (cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \ chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) .endif + +realinstall: .if defined(LINKS) && !empty(LINKS) @set ${LINKS}; \ while test $$# -ge 2; do \ @@ -197,11 +200,12 @@ _FILESINS_${file:T}: ${file} .endfor .endif -install: afterinstall -afterinstall: realinstall .if !defined(NOMAN) -afterinstall: maninstall +realinstall: maninstall .endif + +install: afterinstall +afterinstall: realinstall .endif .if !target(lint) |