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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/libexec Use ${NETBSDSRCDIR}/some/path instead of ${.CURDI...
From: lukem <lukem%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 11:52:44 +0000
details:   https://anonhg.NetBSD.org/src/rev/99a57babb2da
branches:  trunk
changeset: 535456:99a57babb2da
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Aug 19 13:54:34 2002 +0000

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

diffstat:

 libexec/atrun/Makefile        |  6 ++++--
 libexec/ftpd/Makefile         |  8 +++++---
 libexec/hpropd/Makefile       |  8 ++++----
 libexec/kadmind/Makefile      |  8 ++++----
 libexec/kfd/Makefile          |  8 ++++----
 libexec/kpasswdd/Makefile     |  8 ++++----
 libexec/ld.aout_so/Makefile   |  4 ++--
 libexec/ld.elf_so/Makefile    |  4 ++--
 libexec/lfs_cleanerd/Makefile |  6 ++++--
 libexec/makewhatis/Makefile   |  8 +++++---
 libexec/rpc.rstatd/Makefile   |  8 +++++---
 libexec/telnetd/Makefile      |  6 +++---
 libexec/tftpd/Makefile        |  8 +++++---
 13 files changed, 51 insertions(+), 39 deletions(-)

diffs (truncated from 311 to 300 lines):

diff -r 64fabfee8d29 -r 99a57babb2da libexec/atrun/Makefile
--- a/libexec/atrun/Makefile    Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/atrun/Makefile    Mon Aug 19 13:54:34 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.11 1998/07/29 01:15:41 simonb Exp $
+#      $NetBSD: Makefile,v 1.12 2002/08/19 13:54:34 lukem Exp $
+
+.include <bsd.obj.mk>
 
 PROG=  atrun
 BINDIR=        /usr/libexec
 MAN=   atrun.8
 
-CPPFLAGS+= -I${.CURDIR}/../../usr.bin/at
+CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/at
 
 .include <bsd.prog.mk>
diff -r 64fabfee8d29 -r 99a57babb2da libexec/ftpd/Makefile
--- a/libexec/ftpd/Makefile     Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/ftpd/Makefile     Mon Aug 19 13:54:34 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.46 2002/03/22 18:10:22 thorpej Exp $
+#      $NetBSD: Makefile,v 1.47 2002/08/19 13:54:34 lukem Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/4/94
 
+.include <bsd.obj.mk>
+
 PROG=  ftpd
 SRCS=  cmds.c conf.c ftpd.c ftpcmd.y logutmp.c logwtmp.c popen.c
 CPPFLAGS+=-I${.CURDIR}
@@ -11,7 +13,7 @@
 
 # for `internal' ls
 SRCS+= ls.c cmp.c print.c stat_flags.c util.c
-.PATH: ${.CURDIR}/../../bin/ls
+.PATH: ${NETBSDSRCDIR}/bin/ls
 
 CPPFLAGS+=-DINET6
 .include <bsd.own.mk>
@@ -27,7 +29,7 @@
 ftpd.o ftpcmd.o: version.h
 
 # XXX Kerberos support is broken right now.
-#.PATH:        ${.CURDIR}/../../usr.bin/login
+#.PATH:        ${NETBSDSRCDIR}/usr.bin/login
 
 #.ifdef KERBEROS5
 #SRCS+=        k5login.c
diff -r 64fabfee8d29 -r 99a57babb2da libexec/hpropd/Makefile
--- a/libexec/hpropd/Makefile   Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/hpropd/Makefile   Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/12/12 00:51:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/19 13:54:35 lukem Exp $
 
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH:         ${DIST}/heimdal/kdc
 
 WARNS?=                1
@@ -14,14 +14,14 @@
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/kdc                   \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DIST}/heimdal/lib/asn1              \
        -I${DIST}/heimdal/lib/krb5              \
        -I${DESTDIR}/usr/include/kerberosIV     \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
-VERS!=         cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=         cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=         -lhdb -lkrb5 -lkdb -lkrb -lcrypto -lasn1 \
                -lcom_err -L${VERS} -lvers -lroken -lcrypt
diff -r 64fabfee8d29 -r 99a57babb2da libexec/kadmind/Makefile
--- a/libexec/kadmind/Makefile  Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/kadmind/Makefile  Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/12/12 00:51:07 tv Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/19 13:54:35 lukem Exp $
 
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH:         ${DIST}/heimdal/kadmin
 
 WARNS?=                1
@@ -21,13 +21,13 @@
        -I${DIST}/heimdal/kadmin                \
        -I${DIST}/heimdal/lib/krb5              \
        -I${DIST}/heimdal/lib/asn1              \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DESTDIR}/usr/include/kadm5          \
        -I${DESTDIR}/usr/include/kerberosIV     \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
-VERS!=         cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=         cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=         -lkadm5srv -lhdb -lkrb5 -lkadm -lkrb -lcrypto \
                -lasn1 -lcom_err -L${VERS} -lvers -lroken -lcrypt -lutil
diff -r 64fabfee8d29 -r 99a57babb2da libexec/kfd/Makefile
--- a/libexec/kfd/Makefile      Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/kfd/Makefile      Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/12/12 00:51:07 tv Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/19 13:54:35 lukem Exp $
 
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH:         ${DIST}/heimdal/appl/kf
 
 WARNS?=                1
@@ -14,11 +14,11 @@
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/appl/kf               \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H
 
-VERS!=         cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=         cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=         -lkrb5 -lcrypto -lasn1 -lcom_err \
                -L${VERS} -lvers -lroken -lcrypt
diff -r 64fabfee8d29 -r 99a57babb2da libexec/kpasswdd/Makefile
--- a/libexec/kpasswdd/Makefile Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/kpasswdd/Makefile Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/12/12 00:51:07 tv Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/19 13:54:35 lukem Exp $
 
 NOLINT=                # defined
 
 .include <bsd.own.mk>
 
-DIST=          ${.CURDIR}/../../crypto/dist
+DIST=          ${NETBSDSRCDIR}/crypto/dist
 .PATH:         ${DIST}/heimdal/kpasswd
 
 WARNS?=                1
@@ -14,12 +14,12 @@
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/heimdal/kpasswd               \
-       -I${.CURDIR}/../../include/heimdal      \
+       -I${NETBSDSRCDIR}/include/heimdal       \
        -I${DESTDIR}/usr/include/kadm5          \
        -I${DESTDIR}/usr/include/krb5           \
        -DHAVE_CONFIG_H -DINETD_SUPPORT
 
-VERS!=         cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!=         cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD=         -lkadm5srv -lhdb -lkrb5 -lcrypto -lasn1 \
                -lcom_err -L${VERS} -lvers -lroken -lcrypt -lutil
diff -r 64fabfee8d29 -r 99a57babb2da libexec/ld.aout_so/Makefile
--- a/libexec/ld.aout_so/Makefile       Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/ld.aout_so/Makefile       Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.38 2002/04/24 08:18:51 lukem Exp $
+#      $NetBSD: Makefile,v 1.39 2002/08/19 13:54:36 lukem Exp $
 
 .include <bsd.own.mk>
 .if (${OBJECT_FMT} == "a.out")
 PROG=  ld.so
 SRCS=  mdprologue.S rtld.c malloc.c shlib.c md.c vfprintf.c
-CLIB=  ${.CURDIR}/../../lib/libc
+CLIB=  ${NETBSDSRCDIR}/lib/libc
 CLIBOBJ!=cd ${CLIB} && ${PRINTOBJDIR}
 PICFLAG=-fpic -fno-function-cse
 CPPFLAGS+=$(PICFLAG) -DRTLD -DLIBC_SCCS \
diff -r 64fabfee8d29 -r 99a57babb2da libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/ld.elf_so/Makefile        Mon Aug 19 13:54:34 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.50 2002/08/10 01:59:33 thorpej Exp $
+#      $NetBSD: Makefile,v 1.51 2002/08/19 13:54:36 lukem Exp $
 
 .include <bsd.own.mk>                  # for OBJECT_FMT definition
 
@@ -27,7 +27,7 @@
 .include "$M/Makefile.inc"
 .endif
 
-CLIBOBJ!=      cd ${.CURDIR}/../../lib/libc && ${PRINTOBJDIR}
+CLIBOBJ!=      cd ${NETBSDSRCDIR}/lib/libc && ${PRINTOBJDIR}
 
 SRCS+= rtld.c reloc.c symbol.c malloc.c xmalloc.c xprintf.c debug.c \
        map_object.c load.c search.c headers.c paths.c
diff -r 64fabfee8d29 -r 99a57babb2da libexec/lfs_cleanerd/Makefile
--- a/libexec/lfs_cleanerd/Makefile     Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/lfs_cleanerd/Makefile     Mon Aug 19 13:54:34 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.8 2002/06/06 00:56:49 perseant Exp $
+#      $NetBSD: Makefile,v 1.9 2002/08/19 13:54:36 lukem Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/5/93
 
+.include <bsd.own.mk>
+
 PROG=  lfs_cleanerd
 CPPFLAGS+=-I${.CURDIR} -DDIAGNOSTIC
 MAN=   lfs_cleanerd.8
@@ -8,6 +10,6 @@
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-.PATH: ${.CURDIR}/../../sys/ufs/lfs
+.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs
 
 .include <bsd.prog.mk>
diff -r 64fabfee8d29 -r 99a57babb2da libexec/makewhatis/Makefile
--- a/libexec/makewhatis/Makefile       Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/makewhatis/Makefile       Mon Aug 19 13:54:34 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.11 2002/03/08 21:59:07 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.12 2002/08/19 13:54:36 lukem Exp $
+
+.include <bsd.obj.mk>
 
 PROG=  makewhatis
 SRCS=  makewhatis.c config.c
-.PATH: ${.CURDIR}/../../usr.bin/man
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin
+.PATH: ${NETBSDSRCDIR}/usr.bin/man
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin
 
 MAN=   ${PROG}.8
 
diff -r 64fabfee8d29 -r 99a57babb2da libexec/rpc.rstatd/Makefile
--- a/libexec/rpc.rstatd/Makefile       Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/rpc.rstatd/Makefile       Mon Aug 19 13:54:34 2002 +0000
@@ -1,9 +1,11 @@
-#      $NetBSD: Makefile,v 1.17 1999/09/12 01:19:24 chs Exp $
+#      $NetBSD: Makefile,v 1.18 2002/08/19 13:54:37 lukem Exp $
+
+.include <bsd.obj.mk>
 
 PROG = rpc.rstatd
-.PATH: ${.CURDIR}/../../usr.bin/vmstat
+.PATH: ${NETBSDSRCDIR}/usr.bin/vmstat
 
-CPPFLAGS+=-I${.CURDIR}/../../usr.bin/vmstat
+CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmstat
 SRCS = dkstats.c rstatd.c rstat_proc.c
 MAN =  rpc.rstatd.8
 MLINKS=        rpc.rstatd.8 rstatd.8
diff -r 64fabfee8d29 -r 99a57babb2da libexec/telnetd/Makefile
--- a/libexec/telnetd/Makefile  Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/telnetd/Makefile  Mon Aug 19 13:54:34 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2002/03/22 18:10:22 thorpej Exp $
+#      $NetBSD: Makefile,v 1.32 2002/08/19 13:54:37 lukem Exp $
 #      from: @(#)Makefile      8.2 (Berkeley) 12/15/93
 
 .include <bsd.own.mk>
@@ -15,7 +15,7 @@
 DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
 LDADD+=        -lutil -ltermcap -ltelnet
 
-CPPFLAGS+=-I${.CURDIR}/../../lib
+CPPFLAGS+=-I${NETBSDSRCDIR}/lib
 CPPFLAGS+=-I${.CURDIR}
 
 .if (${USE_KERBEROS} != "no")
@@ -23,7 +23,7 @@
 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
 CPPFLAGS+=-DKRB5
 
-VERS!= cd ${.CURDIR}/../../lib/libvers && ${PRINTOBJDIR}
+VERS!= cd ${NETBSDSRCDIR}/lib/libvers && ${PRINTOBJDIR}
 
 LDADD+=        -lkrb5 -lkrb -lcrypto -lasn1 -lcom_err -L${VERS} -lvers -lroken
 DPADD+=        ${LIBKRB5} ${LIBKRB} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
diff -r 64fabfee8d29 -r 99a57babb2da libexec/tftpd/Makefile
--- a/libexec/tftpd/Makefile    Mon Aug 19 13:35:05 2002 +0000
+++ b/libexec/tftpd/Makefile    Mon Aug 19 13:54:34 2002 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.9 2001/11/19 03:20:45 itojun Exp $
+#      $NetBSD: Makefile,v 1.10 2002/08/19 13:54:37 lukem Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/4/93
Prev by Date: [src/trunk]: src/share/mk Explicitly note that if NOxxx and USE_SHLIBDIR are ...
Next by Date: [src/trunk]: src/sys/arch/hppa/hppa Since trap_kdebug() may be a macro, be su...
Previous by Thread: [src/trunk]: src/share/mk Explicitly note that if NOxxx and USE_SHLIBDIR are ...
Next by Thread: [src/trunk]: src/sys/arch/hppa/hppa Since trap_kdebug() may be a macro, be su...
Indexes:
Home | Main Index | Thread Index | Old Index