freebsd-skq/share/mk/bsd.confs.mk
Bryan Drewery 61c20fc782 Make installing to a non-existent directory an error.
Before this, if a file was installed to DESTDIR/some/dir and that directory
was missing due to not having ran 'make distrib-dirs' yet, the file would
be installed as 'some/dir'.  For something like bsd.incs.mk with INCLUDEDIR
being a sub-directory of /usr/include, this could result in all of the headers
being installed to a file rather than getting a directory of them.

Now it will error that the file/directory does not exist rather than hide
the issue.

Another option being discussed is to implement GNU's install -D flag which
would auto create any missing directories.

This is a mitigation of the problem.  The proper order to the build is to
run 'make distrib-dirs' first, but that can be forgotten if building from
a sub-directory after updating the source code to the latest revision.

MFC after:	2 weeks
Sponsored by:	EMC / Isilon Storage Division
2015-10-15 22:49:56 +00:00

88 lines
2.3 KiB
Makefile

# $FreeBSD$
.if !target(__<bsd.init.mk>__)
.error bsd.conf.mk cannot be included directly.
.endif
.if ${MK_INCLUDES} != "no"
CONFGROUPS?= CONFS
.if !target(buildconfig)
.for group in ${CONFSGROUPS}
buildconfig: ${${group}}
.endfor
.endif
all: buildconfig
.if !target(installconfig)
.for group in ${CONFGROUPS}
.if defined(${group}) && !empty(${group})
${group}OWN?= ${SHAREOWN}
${group}GRP?= ${SHAREGRP}
${group}MODE?= ${CONFMODE}
${group}DIR?= ${CONFIGDIR}/
STAGE_SETS+= ${group}
STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}
_${group}CONFS=
.for cnf in ${${group}}
.if defined(${group}OWN_${cnf:T}) || defined(${group}GRP_${cnf:T}) || \
defined(${group}MODE_${cnf:T}) || defined(${group}DIR_${cnf:T}) || \
defined(${group}NAME_${cnf:T}) || defined(${group}NAME)
${group}OWN_${cnf:T}?= ${${group}OWN}
${group}GRP_${cnf:T}?= ${${group}GRP}
${group}MODE_${cnf:T}?= ${${group}MODE}
${group}DIR_${cnf:T}?= ${${group}DIR}
.if defined(${group}NAME)
${group}NAME_${cnf:T}?= ${${group}NAME}
.else
${group}NAME_${cnf:T}?= ${cnf:T}
.endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
# XXX {group}OWN,GRP,MODE
STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
stage_as.${cnf:T}: ${cnf}
stage_config: stage_as.${cnf:T}
installconfig: _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf}
${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}}
.else
_${group}CONFS+= ${cnf}
.endif
.endfor
.if !empty(_${group}CONFS)
stage_files.${group}: ${_${group}CONFS}
stage_config: stage_files.${group}
installconfig: _${group}INS
_${group}INS: ${_${group}CONFS}
.if defined(${group}NAME)
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
.else
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/
.endif
.endif
.endif # defined(${group}) && !empty(${group})
.endfor
.endif # !target(installconfig)
.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
.if !defined(NO_STAGE_CONFIG)
STAGE_TARGETS+= stage_config
.endif
.endif
.endif # ${MK_INCLUDES} != "no"