Handle NO_INCS solely inside bsd.incs.mk.
This commit is contained in:
parent
f9395aff27
commit
b8435aa88d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=155264
@ -4,6 +4,8 @@
|
||||
.error bsd.incs.mk cannot be included directly.
|
||||
.endif
|
||||
|
||||
.if !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
|
||||
|
||||
INCSGROUPS?= INCS
|
||||
|
||||
.if !target(buildincludes)
|
||||
@ -39,12 +41,10 @@ ${group}NAME_${header:T}?= ${header:T}
|
||||
.endif
|
||||
installincludes: _${group}INS_${header:T}
|
||||
_${group}INS_${header:T}: ${header}
|
||||
.if !defined(NO_TOOLCHAIN)
|
||||
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
||||
${.ALLSRC} \
|
||||
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
|
||||
.endif
|
||||
.else
|
||||
_${group}INCS+= ${header}
|
||||
.endif
|
||||
@ -52,7 +52,6 @@ _${group}INCS+= ${header}
|
||||
.if !empty(_${group}INCS)
|
||||
installincludes: _${group}INS
|
||||
_${group}INS: ${_${group}INCS}
|
||||
.if !defined(NO_TOOLCHAIN)
|
||||
.if defined(${group}NAME)
|
||||
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
|
||||
@ -60,7 +59,6 @@ _${group}INS: ${_${group}INCS}
|
||||
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}
|
||||
.endif
|
||||
.endif # !defined(NO_TOOLCHAIN)
|
||||
.endif
|
||||
|
||||
.endif # defined(${group}) && !empty(${group})
|
||||
@ -68,7 +66,6 @@ _${group}INS: ${_${group}INCS}
|
||||
|
||||
.if defined(INCSLINKS) && !empty(INCSLINKS)
|
||||
installincludes:
|
||||
.if !defined(NO_TOOLCHAIN)
|
||||
@set ${INCSLINKS}; \
|
||||
while test $$# -ge 2; do \
|
||||
l=$$1; \
|
||||
@ -78,9 +75,10 @@ installincludes:
|
||||
${ECHO} $$t -\> $$l; \
|
||||
ln -fs $$l $$t; \
|
||||
done; true
|
||||
.endif # !defined(NO_TOOLCHAIN)
|
||||
.endif
|
||||
.endif # !target(installincludes)
|
||||
|
||||
realinstall: installincludes
|
||||
.ORDER: beforeinstall installincludes
|
||||
|
||||
.endif # !defined(NO_INCS) && !defined(NO_TOOLCHAIN)
|
||||
|
@ -244,9 +244,7 @@ _libinstall:
|
||||
|
||||
.include <bsd.nls.mk>
|
||||
.include <bsd.files.mk>
|
||||
.if !defined(NO_INCS)
|
||||
.include <bsd.incs.mk>
|
||||
.endif
|
||||
.include <bsd.links.mk>
|
||||
|
||||
.if !defined(NO_MAN)
|
||||
|
@ -174,9 +174,7 @@ NLSNAME?= ${PROG}
|
||||
.include <bsd.nls.mk>
|
||||
|
||||
.include <bsd.files.mk>
|
||||
.if !defined(NO_INCS)
|
||||
.include <bsd.incs.mk>
|
||||
.endif
|
||||
.include <bsd.links.mk>
|
||||
|
||||
.if !defined(NO_MAN)
|
||||
|
Loading…
Reference in New Issue
Block a user