Source-Changes-HG archive

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

[src/trunk]: src/bin Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../....



details:   https://anonhg.NetBSD.org/src/rev/a93f3bd96c61
branches:  trunk
changeset: 535447:a93f3bd96c61
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Aug 19 09:56:00 2002 +0000

description:
Use ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path (etc).

diffstat:

 bin/csh/Makefile      |   6 ++++--
 bin/df/Makefile       |   6 ++++--
 bin/pax/Makefile      |  16 +++++++++-------
 bin/rcmd/Makefile     |   6 ++++--
 bin/rcp/Makefile      |   4 ++--
 bin/sh/Makefile       |   4 ++--
 bin/systrace/Makefile |   6 ++++--
 7 files changed, 29 insertions(+), 19 deletions(-)

diffs (155 lines):

diff -r 510f38a22ab7 -r a93f3bd96c61 bin/csh/Makefile
--- a/bin/csh/Makefile  Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/csh/Makefile  Mon Aug 19 09:56:00 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 1998/04/13 14:08:27 lukem Exp $
+#      $NetBSD: Makefile,v 1.20 2002/08/19 09:56:00 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -6,13 +6,15 @@
 #
 # To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile.
 
+.include <bsd.own.mk>
+
 PROG=  csh
 DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
 CPPFLAGS+=-I${.CURDIR} -I. ${DFLAGS}
 SRCS=  alloc.c char.c const.c csh.c dir.c dol.c err.c exec.c exp.c file.c \
        func.c glob.c hist.c init.c lex.c misc.c parse.c printf.c proc.c \
        sem.c set.c str.c strpct.c time.c
-.PATH: ${.CURDIR}/../../usr.bin/printf
+.PATH: ${NETBSDSRCDIR}/usr.bin/printf
 
 MLINKS=        csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
        csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/df/Makefile
--- a/bin/df/Makefile   Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/df/Makefile   Mon Aug 19 09:56:00 2002 +0000
@@ -1,8 +1,10 @@
-#      $NetBSD: Makefile,v 1.14 2002/08/02 08:17:12 soren Exp $
+#      $NetBSD: Makefile,v 1.15 2002/08/19 09:56:01 lukem Exp $
 #      @(#)Makefile    8.3 (Berkeley) 5/8/95
 
+.include <bsd.own.mk>
+
 PROG=  df
-.PATH:  ${.CURDIR}/../csh
+.PATH:  ${NETBSDSRCDIR}/bin/csh
 SRCS=  df.c strpct.c
 
 .include <bsd.prog.mk>
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/pax/Makefile
--- a/bin/pax/Makefile  Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/pax/Makefile  Mon Aug 19 09:56:00 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2002/02/02 12:41:14 lukem Exp $
+#      $NetBSD: Makefile,v 1.19 2002/08/19 09:56:01 lukem Exp $
 #       @(#)Makefile   8.1 (Berkeley) 5/31/93
 
 # To install on versions prior to BSD 4.4 the following may have to be
@@ -25,6 +25,8 @@
 #              regex routines and must define NET2_REGEX.
 #              Pax may not compile if this not (un)defined properly.
 
+.include <bsd.own.mk>
+
 PROG=   pax
 SRCS=  ar_io.c ar_subs.c buf_subs.c cpio.c file_subs.c ftree.c\
        gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c\
@@ -34,12 +36,12 @@
 CPPFLAGS+=     -DSMALL
 .else
 SRCS+=         getid.c spec.c misc.c stat_flags.c pack_dev.c
-CPPFLAGS+=     -I${.CURDIR}/../../usr.sbin/mtree \
-               -I${.CURDIR}/../../sbin/mknod \
-               -I${.CURDIR}/../../bin/ls
-.PATH:         ${.CURDIR}/../../usr.sbin/mtree \
-               ${.CURDIR}/../../sbin/mknod \
-               ${.CURDIR}/../../bin/ls
+CPPFLAGS+=     -I${NETBSDSRCDIR}/usr.sbin/mtree \
+               -I${NETBSDSRCDIR}/sbin/mknod \
+               -I${NETBSDSRCDIR}/bin/ls
+.PATH:         ${NETBSDSRCDIR}/usr.sbin/mtree \
+               ${NETBSDSRCDIR}/sbin/mknod \
+               ${NETBSDSRCDIR}/bin/ls
 .endif
 
 # XXX not yet!
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/rcmd/Makefile
--- a/bin/rcmd/Makefile Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/rcmd/Makefile Mon Aug 19 09:56:00 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.5 1997/10/10 19:56:46 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2002/08/19 09:56:01 lukem Exp $
+
+.include <bsd.own.mk>
 
 PROG=  rcmd
 SRCS=  rsh.c
 CPPFLAGS+=-DIN_RCMD
 BINOWN=        root
 BINMODE=4555
-.PATH: ${.CURDIR}/../../usr.bin/rsh
+.PATH: ${NETBSDSRCDIR}/usr.bin/rsh
 
 .include <bsd.prog.mk>
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/rcp/Makefile
--- a/bin/rcp/Makefile  Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/rcp/Makefile  Mon Aug 19 09:56:00 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2002/03/22 18:10:19 thorpej Exp $
+#      $NetBSD: Makefile,v 1.21 2002/08/19 09:56:02 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 
 .include <bsd.own.mk>
@@ -10,7 +10,7 @@
 USE_KERBEROS=  no
 
 .if (${USE_KERBEROS} != "no")
-RLOGIN=        ${.CURDIR}/../../usr.bin/rlogin
+RLOGIN=        ${NETBSDSRCDIR}/usr.bin/rlogin
 .PATH:         ${RLOGIN}
 
 SRCS+=         krcmd.c kcmd.c
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/sh/Makefile
--- a/bin/sh/Makefile   Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/sh/Makefile   Mon Aug 19 09:56:00 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.57 2002/05/15 20:45:17 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.58 2002/08/19 09:56:02 lukem Exp $
 #      @(#)Makefile    8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -25,7 +25,7 @@
 CPPFLAGS+=-DSMALL
 .endif
 
-.PATH: ${.CURDIR}/bltin ${.CURDIR}/../test
+.PATH: ${.CURDIR}/bltin ${NETBSDSRCDIR}/bin/test
 
 CLEANFILES+= mkinit mknodes mksyntax
 CLEANFILES+= ${GENSRCS} y.tab.h
diff -r 510f38a22ab7 -r a93f3bd96c61 bin/systrace/Makefile
--- a/bin/systrace/Makefile     Mon Aug 19 09:46:39 2002 +0000
+++ b/bin/systrace/Makefile     Mon Aug 19 09:56:00 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.5 2002/07/30 16:29:29 itojun Exp $
+#      $NetBSD: Makefile,v 1.6 2002/08/19 09:56:03 lukem Exp $
 #      $OpenBSD: Makefile,v 1.4 2002/06/05 17:34:56 mickey Exp $
 
+.include <bsd.own.mk>
+
 PROG=  systrace
 SRCS=  filter.c intercept-translate.c intercept.c \
        netbsd-syscalls.c util.c \
@@ -8,7 +10,7 @@
        systrace-translate.c systrace.c alias.c register.c \
        parse.y lex.l
 
-CPPFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../sys
+CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/sys
 
 YHEADER=yes
 



Home | Main Index | Thread Index | Old Index