d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle NO_INCS solely inside bsd.incs.mk.

Browse Source
This commit is contained in:
ru 2006-02-03 16:50:32 +00:00
parent a954ec97e7
commit 19edb751d7
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/mk/bsd.incs.mk
View File

@ -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)

2
share/mk/bsd.lib.mk
View File

@ -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)

2
share/mk/bsd.prog.mk
View File

@ -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)