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

This commit is contained in:
lukem 2002-08-19 13:54:34 +00:00
parent 91d06a031b
commit f794aa60bb
13 changed files with 51 additions and 39 deletions

View File

@ -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>

View File

@ -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 @@ MLINKS= ftpusers.5 ftpchroot.5
# 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 @@ LDADD+= -lskey
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

View File

@ -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 @@ MAN= hpropd.8
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

View File

@ -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 @@ CPPFLAGS+= -I. \
-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

View File

@ -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 @@ MAN= kfd.8
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

View File

@ -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 @@ MAN= kpasswdd.8
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

View File

@ -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 \

View File

@ -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 @@ PROG= ld.elf_so
.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

View File

@ -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 @@ SRCS= cleanerd.c lfs_cksum.c library.c misc.c print.c coalesce.c
LDADD+=-lutil
DPADD+=${LIBUTIL}
.PATH: ${.CURDIR}/../../sys/ufs/lfs
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs
.include <bsd.prog.mk>

View File

@ -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

View File

@ -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

View File

@ -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 @@ SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \
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+=-DAUTHENTICATION -DENCRYPTION
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}

View File

@ -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
.include <bsd.obj.mk>
PROG= tftpd
SRCS= tftpd.c tftpsubs.c
MAN= tftpd.8
CPPFLAGS+=-I${.CURDIR}/../../usr.bin/tftp
.PATH: ${.CURDIR}/../../usr.bin/tftp
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/tftp
.PATH: ${NETBSDSRCDIR}/usr.bin/tftp
.include <bsd.prog.mk>