Use ${.ALLSRC:T} when doing the generated variable name lookups, so that it
DTRT for generated files in and obj directory (or accessed via .PATH).
This commit is contained in:
parent
83f22c12ea
commit
750b27b82a
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.files.mk,v 1.13 2000/06/06 09:53:29 mycroft Exp $
|
||||
# $NetBSD: bsd.files.mk,v 1.14 2000/06/10 14:12:03 mycroft Exp $
|
||||
|
||||
# This file can be included multiple times. It clears the definition of
|
||||
# FILES at the end so that this is possible.
|
||||
|
@ -20,9 +20,9 @@ filesinstall:: ${FILES:@F@${DESTDIR}${FILESDIR_${F}:U${FILESDIR}}/${FILESNAME_${
|
|||
|
||||
__fileinstall: .USE
|
||||
${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
|
||||
-o ${FILESOWN_${.ALLSRC}:U${FILESOWN}} \
|
||||
-g ${FILESGRP_${.ALLSRC}:U${FILESGRP}} \
|
||||
-m ${FILESMODE_${.ALLSRC}:U${FILESMODE}} \
|
||||
-o ${FILESOWN_${.ALLSRC:T}:U${FILESOWN}} \
|
||||
-g ${FILESGRP_${.ALLSRC:T}:U${FILESGRP}} \
|
||||
-m ${FILESMODE_${.ALLSRC:T}:U${FILESMODE}} \
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
.for F in ${FILES}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.info.mk,v 1.17 2000/06/10 04:56:59 mycroft Exp $
|
||||
# $NetBSD: bsd.info.mk,v 1.18 2000/06/10 14:12:04 mycroft Exp $
|
||||
|
||||
.if !target(__initialized__)
|
||||
__initialized__:
|
||||
|
@ -43,12 +43,12 @@ infoinstall:: ${INFOFILES:@F@${DESTDIR}${INFODIR_${F}:U${INFODIR}}/${INFONAME_${
|
|||
|
||||
__infoinstall: .USE
|
||||
${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
|
||||
-o ${INFOOWN_${.ALLSRC}:U${INFOOWN}} \
|
||||
-g ${INFOGRP_${.ALLSRC}:U${INFOGRP}} \
|
||||
-m ${INFOMODE_${.ALLSRC}:U${INFOMODE}} \
|
||||
-o ${INFOOWN_${.ALLSRC:T}:U${INFOOWN}} \
|
||||
-g ${INFOGRP_${.ALLSRC:T}:U${INFOGRP}} \
|
||||
-m ${INFOMODE_${.ALLSRC:T}:U${INFOMODE}} \
|
||||
${.ALLSRC} ${.TARGET}
|
||||
@${INSTALL_INFO} --remove --info-dir=${DESTDIR}${INFODIR} ${DESTDIR}${INFODIR}/${.ALLSRC}
|
||||
${INSTALL_INFO} --info-dir=${DESTDIR}${INFODIR} ${DESTDIR}${INFODIR}/${.ALLSRC}
|
||||
@${INSTALL_INFO} --remove --info-dir=${DESTDIR}${INFODIR} ${.TARGET}
|
||||
${INSTALL_INFO} --info-dir=${DESTDIR}${INFODIR} ${.TARGET}
|
||||
|
||||
.for F in ${INFOFILES}
|
||||
.if !defined(BUILD) && !make(all) && !make(${F})
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.prog.mk,v 1.115 2000/06/06 09:53:30 mycroft Exp $
|
||||
# $NetBSD: bsd.prog.mk,v 1.116 2000/06/10 14:12:04 mycroft Exp $
|
||||
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
|
||||
|
||||
.if !target(__initialized__)
|
||||
|
@ -170,9 +170,9 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRI
|
|||
|
||||
__scriptinstall: .USE
|
||||
${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \
|
||||
-o ${SCRIPTSOWN_${.ALLSRC}:U${SCRIPTSOWN}} \
|
||||
-g ${SCRIPTSGRP_${.ALLSRC}:U${SCRIPTSGRP}} \
|
||||
-m ${SCRIPTSMODE_${.ALLSRC}:U${SCRIPTSMODE}} \
|
||||
-o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
|
||||
-g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
|
||||
-m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
.for S in ${SCRIPTS}
|
||||
|
|
Loading…
Reference in New Issue