Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Use ${.ALLSRC:T} when doing the generated variable ...



details:   https://anonhg.NetBSD.org/src/rev/2e80a986fb24
branches:  trunk
changeset: 487639:2e80a986fb24
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Jun 10 14:12:03 2000 +0000

description:
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).

diffstat:

 share/mk/bsd.files.mk |   8 ++++----
 share/mk/bsd.info.mk  |  12 ++++++------
 share/mk/bsd.prog.mk  |   8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (71 lines):

diff -r dd1de7f3f8c7 -r 2e80a986fb24 share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk     Sat Jun 10 13:48:48 2000 +0000
+++ b/share/mk/bsd.files.mk     Sat Jun 10 14:12:03 2000 +0000
@@ -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 @@
 
 __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}
diff -r dd1de7f3f8c7 -r 2e80a986fb24 share/mk/bsd.info.mk
--- a/share/mk/bsd.info.mk      Sat Jun 10 13:48:48 2000 +0000
+++ b/share/mk/bsd.info.mk      Sat Jun 10 14:12:03 2000 +0000
@@ -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: .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})
diff -r dd1de7f3f8c7 -r 2e80a986fb24 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sat Jun 10 13:48:48 2000 +0000
+++ b/share/mk/bsd.prog.mk      Sat Jun 10 14:12:03 2000 +0000
@@ -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 @@
 
 __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}



Home | Main Index | Thread Index | Old Index