mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-11 17:04:19 +01:00
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.
This commit is contained in:
parent
b90dab70f1
commit
8782938772
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96163
@ -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
|
||||
|
||||
.if !defined(NOMAN)
|
||||
realinstall: maninstall
|
||||
.endif
|
||||
|
||||
install: afterinstall
|
||||
afterinstall: realinstall
|
||||
.if !defined(NOMAN)
|
||||
afterinstall: maninstall
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !target(lint)
|
||||
|
Loading…
Reference in New Issue
Block a user