diff options
author | jmmv <jmmv@FreeBSD.org> | 2013-12-28 16:08:10 +0000 |
---|---|---|
committer | jmmv <jmmv@FreeBSD.org> | 2013-12-28 16:08:10 +0000 |
commit | 4fc4ae25674473f65839323106d4039722e16d56 (patch) | |
tree | d2f18ebb9f79a1266420910cb54b16fd49f8f62a /share/mk/bsd.files.mk | |
parent | db4a84c1c286babb9605c8039809737546834855 (diff) | |
download | FreeBSD-src-4fc4ae25674473f65839323106d4039722e16d56.zip FreeBSD-src-4fc4ae25674473f65839323106d4039722e16d56.tar.gz |
Pull up fixes to allow building tests along scripts and data files.
MFC of the following into stable/10:
- r257095 Allow mixing bsd.files.mk with bsd.subdir.mk.
- r258095 Allow this (bsd.progs.mk) to work with fmake.
- r258330 Need to also test for defined(${v}_${PROG}) in bsd.progs.mk.
- r259209 Make bsd.progs.mk work in directories with SCRIPTS but no PROGS.
This is all 'make tinderbox' clean as run on ref10-amd64.
Diffstat (limited to 'share/mk/bsd.files.mk')
-rw-r--r-- | share/mk/bsd.files.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 240f958..2397005 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -14,9 +14,9 @@ buildfiles: ${${group}} all: buildfiles -.if !target(installfiles) .for group in ${FILESGROUPS} .if defined(${group}) && !empty(${group}) +installfiles: installfiles-${group} ${group}OWN?= ${SHAREOWN} ${group}GRP?= ${SHAREGRP} @@ -37,7 +37,7 @@ ${group}NAME_${file:T}?= ${${group}NAME} .else ${group}NAME_${file:T}?= ${file:T} .endif -installfiles: _${group}INS_${file:T} +installfiles-${group}: _${group}INS_${file:T} _${group}INS_${file:T}: ${file} ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ @@ -48,7 +48,7 @@ _${group}FILES+= ${file} .endif .endfor .if !empty(_${group}FILES) -installfiles: _${group}INS +installfiles-${group}: _${group}INS _${group}INS: ${_${group}FILES} .if defined(${group}NAME) ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ @@ -63,7 +63,5 @@ _${group}INS: ${_${group}FILES} .endif # defined(${group}) && !empty(${group}) .endfor -.endif # !target(installfiles) - realinstall: installfiles .ORDER: beforeinstall installfiles |