Page MenuHomeFreeBSD
Files F103120716

D9932.id26124.diff
No OneTemporary
Actions

D9932.id26124.diff
View Options

Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -64,7 +64,7 @@
.error etc.MACHINE/ttys missing
.endif
-OPENBSMDIR= ${.CURDIR}/../contrib/openbsm
+OPENBSMDIR= ${SRCTOP}/contrib/openbsm
BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \
${OPENBSMDIR}/etc/audit_event
BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \
@@ -103,7 +103,7 @@
.endif
.if ${MK_LOCATE} != "no"
-BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc
+BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
.endif
.if ${MK_LPR} != "no"
@@ -111,7 +111,7 @@
.endif
.if ${MK_MAIL} != "no"
-BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc
+BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc
.endif
.if ${MK_NTP} != "no"
@@ -119,12 +119,12 @@
.endif
.if ${MK_OPENSSH} != "no"
-SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
- ${.CURDIR}/../crypto/openssh/sshd_config \
- ${.CURDIR}/../crypto/openssh/moduli
+SSH= ${SRCTOP}/crypto/openssh/ssh_config \
+ ${SRCTOP}/crypto/openssh/sshd_config \
+ ${SRCTOP}/crypto/openssh/moduli
.endif
.if ${MK_OPENSSL} != "no"
-SSL= ${.CURDIR}/../crypto/openssl/apps/openssl.cnf
+SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
.if ${MK_NS_CACHING} != "no"
@@ -185,7 +185,7 @@
afterinstall:
.if ${MK_MAN} != "no"
- ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb
+ ${_+_}cd ${SRCTOP}/share/man; ${MAKE} makedb
.endif
distribute:
@@ -263,8 +263,8 @@
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
- ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
- ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
+ ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
+ ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
@@ -328,9 +328,9 @@
cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${FREEBSD} ${DESTDIR}/
.if ${MK_BOOT} != "no"
-.if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints)
+.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
+ ${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
${DESTDIR}/boot/device.hints
.endif
.endif
Index: etc/sendmail/Makefile
===================================================================
--- etc/sendmail/Makefile
+++ etc/sendmail/Makefile
@@ -6,7 +6,7 @@
ROMODE= 444
RM= rm -f
-SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
SENDMAIL_CF_DIR?=${SENDMAIL_DIR}/cf
Index: gnu/lib/csu/Makefile
===================================================================
--- gnu/lib/csu/Makefile
+++ gnu/lib/csu/Makefile
@@ -3,9 +3,9 @@
.include <src.opts.mk>
MK_SSP= no
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-CCDIR= ${.CURDIR}/../../usr.bin/cc
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+CCDIR= ${SRCTOP}/gnu/usr.bin/cc
.include "${CCDIR}/Makefile.tgt"
.include "${CCDIR}/cc_tools/Makefile.hdrs"
Index: gnu/lib/libdialog/Makefile
===================================================================
--- gnu/lib/libdialog/Makefile
+++ gnu/lib/libdialog/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-DIALOG= ${.CURDIR}/../../../contrib/dialog
+DIALOG= ${SRCTOP}/contrib/dialog
LIB= dialog
SHLIB_MAJOR= 8
Index: gnu/lib/libgcov/Makefile
===================================================================
--- gnu/lib/libgcov/Makefile
+++ gnu/lib/libgcov/Makefile
@@ -5,9 +5,9 @@
.include <src.opts.mk>
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-CCDIR= ${.CURDIR}/../../usr.bin/cc
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+CCDIR= ${SRCTOP}/gnu/usr.bin/cc
.include "${CCDIR}/Makefile.tgt"
.include "${CCDIR}/cc_tools/Makefile.hdrs"
Index: gnu/lib/libgomp/Makefile
===================================================================
--- gnu/lib/libgomp/Makefile
+++ gnu/lib/libgomp/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
SRCDIR= ${GCCLIB}/libgomp
.PATH: ${SRCDIR} ${SRCDIR}/config/posix
Index: gnu/lib/libreadline/Makefile.inc
===================================================================
--- gnu/lib/libreadline/Makefile.inc
+++ gnu/lib/libreadline/Makefile.inc
@@ -3,7 +3,7 @@
SHLIB_MAJOR=8
RL_LIBRARY_VERSION=5.2
-SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
+SRCDIR= ${SRCTOP}/contrib/libreadline
.PATH: ${SRCDIR} ${.CURDIR}/..
LOCAL_CFLAGS= -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
Index: gnu/lib/libregex/Makefile
===================================================================
--- gnu/lib/libregex/Makefile
+++ gnu/lib/libregex/Makefile
@@ -3,7 +3,7 @@
LIB= gnuregex
SHLIB_MAJOR= 5
-REGEXDIR= ${.CURDIR}/../../../contrib/libgnuregex
+REGEXDIR= ${SRCTOP}/contrib/libgnuregex
.PATH: ${REGEXDIR}
SRCS= gnuregex.c
Index: gnu/lib/libssp/Makefile
===================================================================
--- gnu/lib/libssp/Makefile
+++ gnu/lib/libssp/Makefile
@@ -7,8 +7,8 @@
.include <bsd.own.mk>
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
SRCDIR= ${GCCLIB}/libssp
.PATH: ${SRCDIR} ${SRCDIR}/ssp
Index: gnu/lib/libssp/libssp_nonshared/Makefile
===================================================================
--- gnu/lib/libssp/libssp_nonshared/Makefile
+++ gnu/lib/libssp/libssp_nonshared/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-GCCDIR= ${.CURDIR}/../../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
.PATH: ${GCCLIB}/libssp ${GCCLIB}/libssp/ssp
Index: gnu/lib/libstdc++/Makefile
===================================================================
--- gnu/lib/libstdc++/Makefile
+++ gnu/lib/libstdc++/Makefile
@@ -3,9 +3,9 @@
.include <src.opts.mk>
GCCVER= 4.2
-GCCDIR= ${.CURDIR}/../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
-SRCDIR= ${.CURDIR}/../../../contrib/libstdc++
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
+SRCDIR= ${SRCTOP}/contrib/libstdc++
SUPDIR= ${SRCDIR}/libsupc++
.PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
Index: gnu/usr.bin/cc/Makefile.inc
===================================================================
--- gnu/usr.bin/cc/Makefile.inc
+++ gnu/usr.bin/cc/Makefile.inc
@@ -8,8 +8,8 @@
__CC_MAKEFILE_INC__= ${MFILE}
GCCVER= 4.2
-GCCDIR= ${.CURDIR}/../../../../contrib/gcc
-GCCLIB= ${.CURDIR}/../../../../contrib/gcclibs
+GCCDIR= ${SRCTOP}/contrib/gcc
+GCCLIB= ${SRCTOP}/contrib/gcclibs
.include "Makefile.tgt"
Index: gnu/usr.bin/cc/include/Makefile
===================================================================
--- gnu/usr.bin/cc/include/Makefile
+++ gnu/usr.bin/cc/include/Makefile
@@ -6,7 +6,7 @@
INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
-.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../contrib/llvm/tools/clang/lib/Headers
+.PATH: ${GCCDIR}/config/${GCC_CPU} ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers
.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
INCS= ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
Index: gnu/usr.bin/dialog/Makefile
===================================================================
--- gnu/usr.bin/dialog/Makefile
+++ gnu/usr.bin/dialog/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-DIALOG= ${.CURDIR}/../../../contrib/dialog
+DIALOG= ${SRCTOP}/contrib/dialog
PROG= dialog
LIBADD= dialog ncursesw m
Index: gnu/usr.bin/diff/Makefile
===================================================================
--- gnu/usr.bin/diff/Makefile
+++ gnu/usr.bin/diff/Makefile
@@ -2,11 +2,11 @@
.include <src.opts.mk>
-DIFFSRC=${.CURDIR}/../../../contrib/diff/src
+DIFFSRC=${SRCTOP}/contrib/diff/src
.PATH: ${DIFFSRC} \
- ${.CURDIR}/../../../contrib/diff/lib \
- ${.CURDIR}/../../../contrib/diff/man \
- ${.CURDIR}/../../../contrib/diff/doc
+ ${SRCTOP}/contrib/diff/lib \
+ ${SRCTOP}/contrib/diff/man \
+ ${SRCTOP}/contrib/diff/doc
PROG= diff
SRCS= analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
@@ -20,9 +20,9 @@
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
+CFLAGS+=-I${SRCTOP}/contrib/diff
+CFLAGS+=-I${SRCTOP}/contrib/diff/src
+CFLAGS+=-I${SRCTOP}/contrib/diff/lib
CFLAGS+=-I${DESTDIR}/usr/include/gnu
MAN= diff.1 diff.7
Index: gnu/usr.bin/diff3/Makefile
===================================================================
--- gnu/usr.bin/diff3/Makefile
+++ gnu/usr.bin/diff3/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-DIFFSRC=${.CURDIR}/../../../contrib/diff/src
+DIFFSRC=${SRCTOP}/contrib/diff/src
.PATH: ${DIFFSRC} \
- ${.CURDIR}/../../../contrib/diff/lib \
- ${.CURDIR}/../../../contrib/diff/man
+ ${SRCTOP}/contrib/diff/lib \
+ ${SRCTOP}/contrib/diff/man
PROG= diff3
SRCS= diff3.c version-etc.c \
@@ -12,9 +12,9 @@
# Important for ctype macros!
CFLAGS+=-funsigned-char
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
+CFLAGS+=-I${SRCTOP}/contrib/diff/
+CFLAGS+=-I${SRCTOP}/contrib/diff/src
+CFLAGS+=-I${SRCTOP}/contrib/diff/lib
CFLAGS+=-DHAVE_CONFIG_H
CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
Index: gnu/usr.bin/gperf/Makefile
===================================================================
--- gnu/usr.bin/gperf/Makefile
+++ gnu/usr.bin/gperf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
.include <bsd.own.mk>
-GPERFDIR= ${.CURDIR}/../../../contrib/gperf
+GPERFDIR= ${SRCTOP}/contrib/gperf
.PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc
Index: include/Makefile
===================================================================
--- include/Makefile
+++ include/Makefile
@@ -29,7 +29,7 @@
uchar.h ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h \
wchar.h wctype.h wordexp.h xlocale.h
-.PATH: ${.CURDIR}/../contrib/libc-vis
+.PATH: ${SRCTOP}/contrib/libc-vis
INCS+= vis.h
MHDRS= float.h floatingpoint.h stdarg.h
@@ -103,7 +103,7 @@
INCS+= osreldate.h
-SYSDIR= ${.CURDIR}/../sys
+SYSDIR= ${SRCTOP}/sys
NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
PARAM_H= ${SYSDIR}/sys/param.h
MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
@@ -142,7 +142,7 @@
fi
.endfor
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
- -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
+ -f ${SRCTOP}/etc/mtree/BSD.include.dist \
-p ${DESTDIR}${INCLUDEDIR} > /dev/null
copies: .PHONY .META
@@ -156,101 +156,101 @@
fi
.endfor
.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/nand:Ndev/pci} ${LSUBSUBDIRS}
- cd ${.CURDIR}/../sys; \
+ cd ${SRCTOP}/sys; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \
${DESTDIR}${INCLUDEDIR}/$i
.endfor
- cd ${.CURDIR}/../sys/dev/acpica; \
+ cd ${SRCTOP}/sys/dev/acpica; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 acpiio.h \
${DESTDIR}${INCLUDEDIR}/dev/acpica; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 acpi_hpet.h \
${DESTDIR}${INCLUDEDIR}/dev/acpica
- cd ${.CURDIR}/../sys/dev/agp; \
+ cd ${SRCTOP}/sys/dev/agp; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 agpreg.h \
${DESTDIR}${INCLUDEDIR}/dev/agp
- cd ${.CURDIR}/../sys/dev/bktr; \
+ cd ${SRCTOP}/sys/dev/bktr; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
${DESTDIR}${INCLUDEDIR}/dev/bktr
.if ${MK_NAND} != "no"
- cd ${.CURDIR}/../sys/dev/nand; \
+ cd ${SRCTOP}/sys/dev/nand; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nandsim.h \
${DESTDIR}${INCLUDEDIR}/dev/nand; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nand_dev.h \
${DESTDIR}${INCLUDEDIR}/dev/nand
.endif
- cd ${.CURDIR}/../sys/dev/evdev; \
+ cd ${SRCTOP}/sys/dev/evdev; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input.h \
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 input-event-codes.h \
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 uinput.h \
${DESTDIR}${INCLUDEDIR}/dev/evdev
- cd ${.CURDIR}/../sys/dev/hyperv/include; \
+ cd ${SRCTOP}/sys/dev/hyperv/include; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 hyperv.h \
${DESTDIR}${INCLUDEDIR}/dev/hyperv
- cd ${.CURDIR}/../sys/dev/hyperv/utilities; \
+ cd ${SRCTOP}/sys/dev/hyperv/utilities; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 hv_snapshot.h \
${DESTDIR}${INCLUDEDIR}/dev/hyperv
- cd ${.CURDIR}/../sys/dev/pci; \
+ cd ${SRCTOP}/sys/dev/pci; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \
${DESTDIR}${INCLUDEDIR}/dev/pci
- cd ${.CURDIR}/../sys/fs/cd9660/; \
+ cd ${SRCTOP}/sys/fs/cd9660/; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660
.if ${MK_IPFILTER} != "no"
- cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
+ cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/netinet
.endif
.if ${MK_PF} != "no"
- cd ${.CURDIR}/../sys/netpfil/pf; \
+ cd ${SRCTOP}/sys/netpfil/pf; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/netpfil/pf
.endif
- cd ${.CURDIR}/../sys/crypto; \
+ cd ${SRCTOP}/sys/crypto; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \
${DESTDIR}${INCLUDEDIR}/crypto
- cd ${.CURDIR}/../sys/opencrypto; \
+ cd ${SRCTOP}/sys/opencrypto; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/crypto
- cd ${.CURDIR}/../sys/${MACHINE}/include; \
+ cd ${SRCTOP}/sys/${MACHINE}/include; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/machine
-.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
- cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
+.if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
+ cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/machine/pc
.endif
.for _MARCH in ${_MARCHS}
-.if exists(${.CURDIR}/../sys/${_MARCH}/include)
+.if exists(${SRCTOP}/sys/${_MARCH}/include)
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
- cd ${.CURDIR}/../sys/${_MARCH}/include; \
+ cd ${SRCTOP}/sys/${_MARCH}/include; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/${_MARCH}
-.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
+.if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
- cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
+ cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc
.endif
.endif
.endfor
- cd ${.CURDIR}/../sys/rpc; \
+ cd ${SRCTOP}/sys/rpc; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
${DESTDIR}${INCLUDEDIR}/rpc
- cd ${.CURDIR}/../sys/teken; \
+ cd ${SRCTOP}/sys/teken; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${DESTDIR}${INCLUDEDIR}/teken
.if ${MK_CDDL} != "no"
- cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \
+ cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \
${DESTDIR}${INCLUDEDIR}
- cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \
+ cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
${DESTDIR}${INCLUDEDIR}
- cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \
+ cd ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
${DESTDIR}${INCLUDEDIR}/sys
.endif
@@ -258,114 +258,114 @@
symlinks: .PHONY .META
@${ECHO} "Setting up symlinks to kernel source tree..."
.for i in ${LDIRS}
- cd ${.CURDIR}/../sys/$i; \
+ cd ${SRCTOP}/sys/$i; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/nand:Ndev/pci}
- cd ${.CURDIR}/../sys/$i; \
+ cd ${SRCTOP}/sys/$i; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
- cd ${.CURDIR}/../sys/dev/acpica; \
+ cd ${SRCTOP}/sys/dev/acpica; \
for h in acpiio.h acpi_hpet.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/acpica/$$h \
${DESTDIR}${INCLUDEDIR}/dev/acpica; \
done
- cd ${.CURDIR}/../sys/dev/agp; \
+ cd ${SRCTOP}/sys/dev/agp; \
for h in agpreg.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/agp/$$h \
${DESTDIR}${INCLUDEDIR}/dev/agp; \
done
- cd ${.CURDIR}/../sys/dev/bktr; \
+ cd ${SRCTOP}/sys/dev/bktr; \
for h in ioctl_*.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/bktr/$$h \
${DESTDIR}${INCLUDEDIR}/dev/bktr; \
done
.if ${MK_NAND} != "no"
- cd ${.CURDIR}/../sys/dev/nand; \
+ cd ${SRCTOP}/sys/dev/nand; \
for h in nandsim.h nand_dev.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/nand/$$h \
${DESTDIR}${INCLUDEDIR}/dev/nand; \
done
.endif
- cd ${.CURDIR}/../sys/dev/evdev; \
+ cd ${SRCTOP}/sys/dev/evdev; \
for h in input.h input-event-codes.h uinput.h; do \
ln -fs ../../../../sys/dev/evdev/$$h \
${DESTDIR}${INCLUDEDIR}/dev/evdev; \
done
- cd ${.CURDIR}/../sys/dev/hyperv/include; \
+ cd ${SRCTOP}/sys/dev/hyperv/include; \
for h in hyperv.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/hyperv/include/$$h \
${DESTDIR}${INCLUDEDIR}/dev/hyperv; \
done
- cd ${.CURDIR}/../sys/dev/hyperv/utilities; \
+ cd ${SRCTOP}/sys/dev/hyperv/utilities; \
for h in hv_snapshot.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/hyperv/utilities/$$h \
${DESTDIR}${INCLUDEDIR}/dev/hyperv; \
done
- cd ${.CURDIR}/../sys/dev/pci; \
+ cd ${SRCTOP}/sys/dev/pci; \
for h in pcireg.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/pci/$$h \
${DESTDIR}${INCLUDEDIR}/dev/pci; \
done
.for i in ${LSUBSUBDIRS}
- cd ${.CURDIR}/../sys/$i; \
+ cd ${SRCTOP}/sys/$i; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
done
.endfor
.if ${MK_IPFILTER} != "no"
- cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
+ cd ${SRCTOP}/sys/contrib/ipfilter/netinet; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/contrib/ipfilter/netinet/$$h \
${DESTDIR}${INCLUDEDIR}/netinet; \
done
.endif
.if ${MK_PF} != "no"
- cd ${.CURDIR}/../sys/netpfil/pf; \
+ cd ${SRCTOP}/sys/netpfil/pf; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/netpfil/pf/$$h \
${DESTDIR}${INCLUDEDIR}/netpfil/pf; \
done
.endif
- cd ${.CURDIR}/../sys/crypto; \
+ cd ${SRCTOP}/sys/crypto; \
for h in rijndael/rijndael.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/crypto/$$h \
${DESTDIR}${INCLUDEDIR}/crypto; \
done
- cd ${.CURDIR}/../sys/opencrypto; \
+ cd ${SRCTOP}/sys/opencrypto; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/opencrypto/$$h \
${DESTDIR}${INCLUDEDIR}/crypto; \
done
- cd ${.CURDIR}/../sys/${MACHINE}/include; \
+ cd ${SRCTOP}/sys/${MACHINE}/include; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/${MACHINE}/include/$$h \
${DESTDIR}${INCLUDEDIR}/machine; \
done
-.if exists(${.CURDIR}/../sys/${MACHINE}/include/pc)
- cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \
+.if exists(${SRCTOP}/sys/${MACHINE}/include/pc)
+ cd ${SRCTOP}/sys/${MACHINE}/include/pc; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/${MACHINE}/include/pc/$$h \
${DESTDIR}${INCLUDEDIR}/machine/pc; \
done
.endif
.for _MARCH in ${_MARCHS}
-.if exists(${.CURDIR}/../sys/${_MARCH}/include)
+.if exists(${SRCTOP}/sys/${_MARCH}/include)
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
- cd ${.CURDIR}/../sys/${_MARCH}/include; \
+ cd ${SRCTOP}/sys/${_MARCH}/include; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/${_MARCH}/include/$$h \
${DESTDIR}${INCLUDEDIR}/${_MARCH}; \
done
-.if exists(${.CURDIR}/../sys/${_MARCH}/include/pc)
+.if exists(${SRCTOP}/sys/${_MARCH}/include/pc)
${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
- cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \
+ cd ${SRCTOP}/sys/${_MARCH}/include/pc; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/${_MARCH}/include/pc/$$h \
${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \
@@ -373,12 +373,12 @@
.endif
.endif
.endfor
- cd ${.CURDIR}/../sys/fs/cd9660; \
+ cd ${SRCTOP}/sys/fs/cd9660; \
for h in *.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/fs/cd9660/$$h \
${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \
done
- cd ${.CURDIR}/../sys/rpc; \
+ cd ${SRCTOP}/sys/rpc; \
for h in types.h; do \
${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \
${DESTDIR}${INCLUDEDIR}/rpc; \
Index: lib/libipsec/Makefile
===================================================================
--- lib/libipsec/Makefile
+++ lib/libipsec/Makefile
@@ -40,7 +40,7 @@
CFLAGS+=-DINET6
.endif
-#.PATH: ${.CURDIR}/../../sys/netipsec
+#.PATH: ${SRCTOP}/sys/netipsec
#SRCS= pfkey.c pfkey_dump.c
SRCS+= ipsec_strerror.c policy_parse.y policy_token.l
SRCS+= ipsec_dump_policy.c ipsec_get_policylen.c
Index: lib/libpathconv/Makefile
===================================================================
--- lib/libpathconv/Makefile
+++ lib/libpathconv/Makefile
@@ -10,7 +10,7 @@
SRCS= abs2rel.c rel2abs.c
-#VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+#VERSION_DEF= ${SRCTOP/lib/libc/Versions.def
#SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no"
Index: rescue/librescue/Makefile
===================================================================
--- rescue/librescue/Makefile
+++ rescue/librescue/Makefile
@@ -13,10 +13,10 @@
# This library should never be installed, and isn't even linked
# with in the normal way. (See ../rescue/Makefile for details.)
-.PATH: ${.CURDIR}/../../lib/libc/gen \
- ${.CURDIR}/../../lib/libc/net \
- ${.CURDIR}/../../lib/libc/stdlib \
- ${.CURDIR}/../../lib/libutil
+.PATH: ${SRCTOP}/lib/libc/gen \
+ ${SRCTOP}/lib/libc/net \
+ ${SRCTOP}/lib/libc/stdlib \
+ ${SRCTOP}/lib/libutil
LIB= rescue
INTERNALLIB= # Don't install this library
@@ -42,6 +42,6 @@
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
-CFLAGS+= -I${.CURDIR}/../../lib/libc/include
+CFLAGS+= -I${SRCTOP}/lib/libc/include
.include <bsd.lib.mk>
Index: rescue/rescue/Makefile
===================================================================
--- rescue/rescue/Makefile
+++ rescue/rescue/Makefile
@@ -159,16 +159,16 @@
CRUNCH_ALIAS_bsdlabel= disklabel
.endif
-CRUNCH_SRCDIR_atm= $(.CURDIR)/../../sbin/atm/atm
-CRUNCH_SRCDIR_atmconfig= $(.CURDIR)/../../sbin/atm/atmconfig
-CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld
-CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
-CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
-CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf
+CRUNCH_SRCDIR_atm= ${SRCTOP}/sbin/atm/atm
+CRUNCH_SRCDIR_atmconfig= ${SRCTOP}/sbin/atm/atmconfig
+CRUNCH_SRCDIR_fore_dnld= ${SRCTOP}/sbin/atm/fore_dnld
+CRUNCH_SRCDIR_ilmid= ${SRCTOP}/sbin/atm/ilmid
+CRUNCH_SRCDIR_rtquery= ${SRCTOP}/sbin/routed/rtquery
+CRUNCH_SRCDIR_ipf= ${SRCTOP}/sbin/ipf/ipf
.if ${MK_ZFS} != "no"
-CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
-CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
-CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb
+CRUNCH_SRCDIR_zfs= ${SRCTOP}/cddl/sbin/zfs
+CRUNCH_SRCDIR_zpool= ${SRCTOP}/cddl/sbin/zpool
+CRUNCH_SRCDIR_zdb= ${SRCTOP}/cddl/usr.sbin/zdb
.endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore
Index: usr.bin/bsdiff/bsdiff/Makefile
===================================================================
--- usr.bin/bsdiff/bsdiff/Makefile
+++ usr.bin/bsdiff/bsdiff/Makefile
@@ -4,11 +4,11 @@
# libdivsufsort configured with:
# cmake -DCMAKE_BUILD_TYPE="Release" -DBUILD_DIVSUFSORT64=ON
-.PATH: ${.CURDIR}/../../../contrib/libdivsufsort/lib
+.PATH: ${SRCTOP}/contrib/libdivsufsort/lib
CFLAGS+= -DHAVE_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CFLAGS+= -D_LARGE_FILES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
CFLAGS+= -D__STDC_LIMIT_MACROS -DBUILD_DIVSUFSORT64
-CFLAGS+= -I${.CURDIR}/../../../contrib/libdivsufsort/include -I${.CURDIR}
+CFLAGS+= -I${SRCTOP}/contrib/libdivsufsort/include -I${.CURDIR}
SRCS= divsufsort.c sssort.c trsort.c utils.c
SRCS+= bsdiff.c
Index: usr.bin/bzip2/Makefile
===================================================================
--- usr.bin/bzip2/Makefile
+++ usr.bin/bzip2/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-BZ2DIR= ${.CURDIR}/../../contrib/bzip2
+BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2
Index: usr.bin/bzip2recover/Makefile
===================================================================
--- usr.bin/bzip2recover/Makefile
+++ usr.bin/bzip2recover/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-BZ2DIR= ${.CURDIR}/../../contrib/bzip2
+BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2recover
Index: usr.bin/chkey/Makefile
===================================================================
--- usr.bin/chkey/Makefile
+++ usr.bin/chkey/Makefile
@@ -2,11 +2,11 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../newkey
+.PATH: ${SRCTOP}/usr.bin/newkey
PROG= chkey
SRCS= chkey.c generic.c update.c
-CFLAGS+= -I${.CURDIR}/../newkey
+CFLAGS+= -I${SRCTOP}/usr.bin/newkey
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
Index: usr.bin/chpass/Makefile
===================================================================
--- usr.bin/chpass/Makefile
+++ usr.bin/chpass/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
+.PATH: ${SRCTOP}/usr.sbin/pwd_mkdb ${SRCTOP}/lib/libc/gen
PROG= chpass
SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c
@@ -15,7 +15,7 @@
.endif
#Some people need this, uncomment to activate
#CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
-CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
+CFLAGS+=-I${SRCTOP}/usr.sbin/pwd_mkdb -I${SRCTOP}/lib/libc/gen -I.
LIBADD= crypt util
.if ${MK_NIS} != "no"
Index: usr.bin/compile_et/Makefile
===================================================================
--- usr.bin/compile_et/Makefile
+++ usr.bin/compile_et/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/com_err
+.PATH: ${SRCTOP}/contrib/com_err
PROG= compile_et
SRCS= compile_et.c parse.y lex.l
LIBADD= roken vers
-CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err
+CFLAGS+=-I. -I${SRCTOP}/contrib/com_err
WARNS?= 0
Index: usr.bin/cpio/Makefile
===================================================================
--- usr.bin/cpio/Makefile
+++ usr.bin/cpio/Makefile
@@ -2,8 +2,8 @@
.include <src.opts.mk>
-_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
-_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive
+_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
+_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcpio
BSDCPIO_VERSION_STRING= 3.3.1
Index: usr.bin/ctlstat/Makefile
===================================================================
--- usr.bin/ctlstat/Makefile
+++ usr.bin/ctlstat/Makefile
@@ -2,7 +2,7 @@
PROG= ctlstat
MAN= ctlstat.8
-SDIR= ${.CURDIR}/../../sys
+SDIR= ${SRCTOP}/sys
CFLAGS+= -I${SDIR}
.include <bsd.prog.mk>
Index: usr.bin/drill/Makefile
===================================================================
--- usr.bin/drill/Makefile
+++ usr.bin/drill/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
+LDNSDIR= ${SRCTOP}/contrib/ldns
.PATH: ${LDNSDIR}/drill
Index: usr.bin/ee/Makefile
===================================================================
--- usr.bin/ee/Makefile
+++ usr.bin/ee/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/ee
+.PATH: ${SRCTOP}/contrib/ee
CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
-DHAS_SYS_WAIT
@@ -29,7 +29,7 @@
. if exists(${.CURDIR}/nls/${lang}/ee.msg)
NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang}
. else
-NLSSRCDIR_${lang}= ${.CURDIR}/../../contrib/ee
+NLSSRCDIR_${lang}= ${SRCTOP}/contrib/ee
. endif
.endfor
Index: usr.bin/elfcopy/Makefile
===================================================================
--- usr.bin/elfcopy/Makefile
+++ usr.bin/elfcopy/Makefile
@@ -28,7 +28,7 @@
# This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile
# We need to link against the correct version of these files. One
-# solution is to include ../../sys in the include path. This causes
+# solution is to include SRCTOP/sys in the include path. This causes
# problems when a header file in sys depends on a file in another
# part of the tree, e.g. a machine dependent header.
#
Index: usr.bin/factor/Makefile
===================================================================
--- usr.bin/factor/Makefile
+++ usr.bin/factor/Makefile
@@ -5,7 +5,7 @@
PROG= factor
SRCS= factor.c pr_tbl.c
-CFLAGS+=-I${.CURDIR}/../primes
+CFLAGS+=-I${SRCTOP}/usr.bin/primes
.if ${MK_OPENSSL} != "no"
CFLAGS+=-DHAVE_OPENSSL
@@ -14,6 +14,6 @@
MAN= factor.6
MLINKS+=factor.6 primes.6
-.PATH: ${.CURDIR}/../primes
+.PATH: ${SRCTOP}/usr.bin/primes
.include <bsd.prog.mk>
Index: usr.bin/file/Makefile
===================================================================
--- usr.bin/file/Makefile
+++ usr.bin/file/Makefile
@@ -20,7 +20,7 @@
# ever read sources, credits must appear in the documentation.
# 4. This notice may not be removed or altered.
-SRCDIR= ${.CURDIR}/../../contrib/file
+SRCDIR= ${SRCTOP}/contrib/file
.PATH: ${SRCDIR}/src
.PATH: ${SRCDIR}/doc
@@ -29,12 +29,12 @@
MAGICPATH?= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR}/../../lib/libmagic
+CFLAGS+= -I${SRCTOP}/lib/libmagic
LIBADD= magic
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
- ${.CURDIR}/../../lib/libmagic/config.h
+ ${SRCTOP}/lib/libmagic/config.h
CLEANFILES+= ${MAN}
Index: usr.bin/ftp/Makefile
===================================================================
--- usr.bin/ftp/Makefile
+++ usr.bin/ftp/Makefile
@@ -8,7 +8,7 @@
#
#CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21
-TNFTP= ${.CURDIR}/../../contrib/tnftp
+TNFTP= ${SRCTOP}/contrib/tnftp
.PATH: ${TNFTP}/src
PROG= ftp
Index: usr.bin/host/Makefile
===================================================================
--- usr.bin/host/Makefile
+++ usr.bin/host/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
-LDNSHOSTDIR= ${.CURDIR}/../../contrib/ldns-host
+LDNSDIR= ${SRCTOP}/contrib/ldns
+LDNSHOSTDIR= ${SRCTOP}/contrib/ldns-host
.PATH: ${LDNSHOSTDIR}
Index: usr.bin/ipcrm/Makefile
===================================================================
--- usr.bin/ipcrm/Makefile
+++ usr.bin/ipcrm/Makefile
@@ -3,8 +3,8 @@
PROG= ipcrm
SRCS= ipcrm.c ipc.c
LIBADD= kvm
-CFLAGS+=-I${.CURDIR}/../ipcs
-.PATH: ${.CURDIR}/../ipcs
+CFLAGS+=-I${SRCTOP}/usr.bin/ipcs
+.PATH: ${SRCTOP}/usr.bin/ipcs
WARNS?= 0
Index: usr.bin/iscsictl/Makefile
===================================================================
--- usr.bin/iscsictl/Makefile
+++ usr.bin/iscsictl/Makefile
@@ -4,7 +4,7 @@
PROG= iscsictl
SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h
CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi
+CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
MAN= iscsi.conf.5 iscsictl.8
LIBADD= xo
Index: usr.bin/kdump/Makefile
===================================================================
--- usr.bin/kdump/Makefile
+++ usr.bin/kdump/Makefile
@@ -3,11 +3,11 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../ktrace
+.PATH: ${SRCTOP}/usr.bin/ktrace
PROG= kdump
SRCS= kdump.c subr.c
-CFLAGS+= -I${.CURDIR}/../ktrace #-I${.CURDIR}/../...
+CFLAGS+= -I${SRCTOP}/usr.bin/ktrace
LIBADD= sysdecode
.if ${MK_CASPER} != "no"
Index: usr.bin/less/Makefile.common
===================================================================
--- usr.bin/less/Makefile.common
+++ usr.bin/less/Makefile.common
@@ -1,9 +1,9 @@
# $FreeBSD$
-LSDIR= ${.CURDIR}/../../contrib/less
+LSDIR= ${SRCTOP}/contrib/less
.PATH: ${LSDIR}
-CFLAGS+=-I${.CURDIR}/../less -I${LSDIR}
+CFLAGS+=-I${SRCTOP}/usr.bin/less -I${LSDIR}
WARNS?= 1
.SUFFIXES: .nro .1
Index: usr.bin/lessecho/Makefile
===================================================================
--- usr.bin/lessecho/Makefile
+++ usr.bin/lessecho/Makefile
@@ -4,5 +4,5 @@
SRCS= lessecho.c version.c
CLEANFILES= lessecho.1
-.include "${.CURDIR}/../less/Makefile.common"
+.include "${SRCTOP}/usr.bin/less/Makefile.common"
.include <bsd.prog.mk>
Index: usr.bin/lesskey/Makefile
===================================================================
--- usr.bin/lesskey/Makefile
+++ usr.bin/lesskey/Makefile
@@ -4,5 +4,5 @@
SRCS= lesskey.c version.c
CLEANFILES= lesskey.1
-.include "${.CURDIR}/../less/Makefile.common"
+.include "${SRCTOP}/usr.bin/less/Makefile.common"
.include <bsd.prog.mk>
Index: usr.bin/lex/Makefile
===================================================================
--- usr.bin/lex/Makefile
+++ usr.bin/lex/Makefile
@@ -14,7 +14,7 @@
LINKS+= ${BINDIR}/lex ${BINDIR}/flex
LINKS+= ${BINDIR}/lex ${BINDIR}/flex++
-FLEXDIR= ${.CURDIR}/../../contrib/flex
+FLEXDIR= ${SRCTOP}/contrib/flex
.PATH: ${FLEXDIR}
Index: usr.bin/lex/lib/Makefile
===================================================================
--- usr.bin/lex/lib/Makefile
+++ usr.bin/lex/lib/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/flex
+.PATH: ${SRCTOP}/contrib/flex
LIB= ln
SRCS= libmain.c libyywrap.c
Index: usr.bin/locale/Makefile
===================================================================
--- usr.bin/locale/Makefile
+++ usr.bin/locale/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= locale
-CFLAGS+= -I${.CURDIR}/../../lib/libc/locale
+CFLAGS+= -I${SRCTOP}/lib/libc/locale
.include <bsd.prog.mk>
Index: usr.bin/localedef/Makefile
===================================================================
--- usr.bin/localedef/Makefile
+++ usr.bin/localedef/Makefile
@@ -20,7 +20,7 @@
IGNORE_PRAGMA= yes
CFLAGS+= -I. -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../../lib/libc/locale
-CFLAGS+= -I${.CURDIR}/../../lib/libc/stdtime
+CFLAGS+= -I${SRCTOP}/lib/libc/locale
+CFLAGS+= -I${SRCTOP}/lib/libc/stdtime
.include <bsd.prog.mk>
Index: usr.bin/lzmainfo/Makefile
===================================================================
--- usr.bin/lzmainfo/Makefile
+++ usr.bin/lzmainfo/Makefile
@@ -2,8 +2,8 @@
PROG= lzmainfo
-XZDIR= ${.CURDIR}/../../contrib/xz/src
-LZMALIBDIR= ${.CURDIR}/../../lib/liblzma
+XZDIR= ${SRCTOP}/contrib/xz/src
+LZMALIBDIR= ${SRCTOP}/lib/liblzma
.PATH: ${XZDIR}/lzmainfo
SRCS+= lzmainfo.c
Index: usr.bin/m4/Makefile
===================================================================
--- usr.bin/m4/Makefile
+++ usr.bin/m4/Makefile
@@ -7,7 +7,7 @@
.include <src.opts.mk>
PROG= m4
-CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libopenbsd
+CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd
LIBADD= y l m openbsd
NO_WMISSING_VARIABLE_DECLARATIONS=
Index: usr.bin/mandoc/Makefile
===================================================================
--- usr.bin/mandoc/Makefile
+++ usr.bin/mandoc/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
+MDOCMLDIR= ${SRCTOP}/contrib/mdocml
.PATH: ${MDOCMLDIR}
PROG= mandoc
@@ -89,7 +89,7 @@
WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
- -I${.CURDIR}/../../lib/libopenbsd/
+ -I${SRCTOP}/lib/libopenbsd/
LIBADD= openbsd z
.include <bsd.prog.mk>
Index: usr.bin/minigzip/Makefile
===================================================================
--- usr.bin/minigzip/Makefile
+++ usr.bin/minigzip/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR= ${.CURDIR}/../../contrib/zlib/test
+SRCDIR= ${SRCTOP}/contrib/zlib/test
.PATH: ${SRCDIR}
PROG= minigzip
Index: usr.bin/mkcsmapper/Makefile
===================================================================
--- usr.bin/mkcsmapper/Makefile
+++ usr.bin/mkcsmapper/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
PROG= mkcsmapper
-LDFLAGS+= -L${.CURDIR}/../../lib/libc
+LDFLAGS+= -L${SRCTOP}/lib/libc
NO_WMISSING_VARIABLE_DECLARATIONS=
Index: usr.bin/mkcsmapper/Makefile.inc
===================================================================
--- usr.bin/mkcsmapper/Makefile.inc
+++ usr.bin/mkcsmapper/Makefile.inc
@@ -3,7 +3,7 @@
.include <bsd.compiler.mk>
SRCS+= lex.l yacc.y
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkcsmapper \
- -I${.CURDIR}/../../lib/libc/iconv \
- -I${.CURDIR}/../../lib/libiconv_modules/mapper_std
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/usr.bin/mkcsmapper \
+ -I${SRCTOP}/lib/libc/iconv \
+ -I${SRCTOP}/lib/libiconv_modules/mapper_std
CFLAGS.gcc+= --param max-inline-insns-single=64
Index: usr.bin/mkcsmapper_static/Makefile
===================================================================
--- usr.bin/mkcsmapper_static/Makefile
+++ usr.bin/mkcsmapper_static/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkcsmapper
+.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper
PROG= mkcsmapper_static
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
@@ -11,7 +11,7 @@
build-tools: mkcsmapper_static
-.include "${.CURDIR}/../mkcsmapper/Makefile.inc"
+.include "${SRCTOP}/usr.bin/mkcsmapper/Makefile.inc"
.include <bsd.prog.mk>
${PROG}: ${BUILD_TOOLS_META}
Index: usr.bin/mkesdb/Makefile
===================================================================
--- usr.bin/mkesdb/Makefile
+++ usr.bin/mkesdb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
PROG= mkesdb
Index: usr.bin/mkesdb_static/Makefile
===================================================================
--- usr.bin/mkesdb_static/Makefile
+++ usr.bin/mkesdb_static/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkesdb
+.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb
PROG= mkesdb_static
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
@@ -11,7 +11,7 @@
build-tools: mkesdb_static
-.include "${.CURDIR}/../mkesdb/Makefile.inc"
+.include "${SRCTOP}/usr.bin/mkesdb/Makefile.inc"
.include <bsd.prog.mk>
${PROG}: ${BUILD_TOOLS_META}
Index: usr.bin/mklocale/Makefile
===================================================================
--- usr.bin/mklocale/Makefile
+++ usr.bin/mklocale/Makefile
@@ -3,7 +3,7 @@
PROG= mklocale
SRCS= yacc.y lex.l y.tab.h
-CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
+CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/lib/libc/locale
NO_WMISSING_VARIABLE_DECLARATIONS=
Index: usr.bin/nc/Makefile
===================================================================
--- usr.bin/nc/Makefile
+++ usr.bin/nc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/netcat
+.PATH: ${SRCTOP}/contrib/netcat
PROG= nc
SRCS= netcat.c atomicio.c socks.c
Index: usr.bin/opieinfo/Makefile
===================================================================
--- usr.bin/opieinfo/Makefile
+++ usr.bin/opieinfo/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
#
-OPIE_DIST?= ${.CURDIR}/../../contrib/opie
+OPIE_DIST?= ${SRCTOP}/contrib/opie
PROG= opieinfo
-CFLAGS+=-I${.CURDIR}/../../lib/libopie
+CFLAGS+=-I${SRCTOP}/lib/libopie
CFLAGS+=-I${OPIE_DIST}
CFLAGS+=-DINSECURE_OVERRIDE
Index: usr.bin/opiekey/Makefile
===================================================================
--- usr.bin/opiekey/Makefile
+++ usr.bin/opiekey/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
#
-OPIE_DIST?= ${.CURDIR}/../../contrib/opie
+OPIE_DIST?= ${SRCTOP}/contrib/opie
PROG= opiekey
-CFLAGS+=-I${.CURDIR}/../../lib/libopie
+CFLAGS+=-I${SRCTOP}/lib/libopie
CFLAGS+=-I${OPIE_DIST}
CFLAGS+=-DINSECURE_OVERRIDE
Index: usr.bin/opiepasswd/Makefile
===================================================================
--- usr.bin/opiepasswd/Makefile
+++ usr.bin/opiepasswd/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
#
-OPIE_DIST?= ${.CURDIR}/../../contrib/opie
+OPIE_DIST?= ${SRCTOP}/contrib/opie
PROG= opiepasswd
-CFLAGS+=-I${.CURDIR}/../../lib/libopie
+CFLAGS+=-I${SRCTOP}/lib/libopie
CFLAGS+=-I${OPIE_DIST}
CFLAGS+=-DINSECURE_OVERRIDE
Index: usr.bin/pamtest/Makefile
===================================================================
--- usr.bin/pamtest/Makefile
+++ usr.bin/pamtest/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-OPENPAM= ${.CURDIR}/../../contrib/openpam
+OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest
PROG= pamtest
Index: usr.bin/readelf/Makefile
===================================================================
--- usr.bin/readelf/Makefile
+++ usr.bin/readelf/Makefile
@@ -14,7 +14,7 @@
# This same hack is in lib/libelf/Makefile and lib/libdwarf/Makefile
# We need to link against the correct version of these files. One
-# solution is to include ../../sys in the include path. This causes
+# solution is to include SRCTOP/sys in the include path. This causes
# problems when a header file in sys depends on a file in another
# part of the tree, e.g. a machine dependent header.
#
Index: usr.bin/rsh/Makefile
===================================================================
--- usr.bin/rsh/Makefile
+++ usr.bin/rsh/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= rsh
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
+CFLAGS+=-I${SRCTOP}/libexec/rlogind
PACKAGE=rcmds
Index: usr.bin/smbutil/Makefile
===================================================================
--- usr.bin/smbutil/Makefile
+++ usr.bin/smbutil/Makefile
@@ -5,7 +5,7 @@
LIBADD= smb
-CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR= ${SRCTOP}/contrib/smbfs
CFLAGS+= -I${CONTRIBDIR}/include
WARNS?= 0
Index: usr.bin/svn/lib/Makefile.inc
===================================================================
--- usr.bin/svn/lib/Makefile.inc
+++ usr.bin/svn/lib/Makefile.inc
@@ -2,11 +2,11 @@
.if !defined(SVNDIR)
-SVNDIR= ${.CURDIR}/../../../../contrib/subversion/subversion
-APRU= ${.CURDIR}/../../../../contrib/apr-util
-APR= ${.CURDIR}/../../../../contrib/apr
-SQLITE= ${.CURDIR}/../../../../contrib/sqlite3
-SERF= ${.CURDIR}/../../../../contrib/serf
+SVNDIR= ${SRCTOP}/contrib/subversion/subversion
+APRU= ${SRCTOP}/contrib/apr-util
+APR= ${SRCTOP}/contrib/apr
+SQLITE= ${SRCTOP}/contrib/sqlite3
+SERF= ${SRCTOP}/contrib/serf
WARNS?= 0 # definitely not ready
Index: usr.bin/tar/Makefile
===================================================================
--- usr.bin/tar/Makefile
+++ usr.bin/tar/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
-_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
+_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
PROG= bsdtar
BSDTAR_VERSION_STRING= 3.3.1
@@ -27,7 +27,7 @@
.endif
CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\"
CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/libarchive
CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe
SYMLINKS= bsdtar ${BINDIR}/tar
Index: usr.bin/telnet/Makefile
===================================================================
--- usr.bin/telnet/Makefile
+++ usr.bin/telnet/Makefile
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-TELNETDIR= ${.CURDIR}/../../contrib/telnet
+TELNETDIR= ${SRCTOP}/contrib/telnet
.PATH: ${TELNETDIR}/telnet
PROG= telnet
Index: usr.bin/tftp/Makefile
===================================================================
--- usr.bin/tftp/Makefile
+++ usr.bin/tftp/Makefile
@@ -1,12 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.PATH: ${.CURDIR}/../../libexec/tftpd
+.PATH: ${SRCTOP}/libexec/tftpd
PROG= tftp
SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+= tftp-utils.c tftp.c
-CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
+CFLAGS+=-I${SRCTOP}/libexec/tftpd
LIBADD= edit
Index: usr.bin/top/Makefile
===================================================================
--- usr.bin/top/Makefile
+++ usr.bin/top/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-TOPDIR= ${.CURDIR}/../../contrib/top
+TOPDIR= ${SRCTOP}/contrib/top
.PATH: ${TOPDIR}
PROG= top
@@ -24,7 +24,7 @@
LIBADD= ncursesw m kvm jail
CLEANFILES= sigdesc.h
-SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk
+SIGCONV_AWK= ${SRCTOP}/contrib/top/sigconv.awk
STAGED_INCLUDE_DIR?= ${DESTDIR}/usr/include
SIGNAL_H= ${STAGED_INCLUDE_DIR}/sys/signal.h
sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H}
Index: usr.bin/truss/Makefile
===================================================================
--- usr.bin/truss/Makefile
+++ usr.bin/truss/Makefile
@@ -6,8 +6,8 @@
LIBADD= sysdecode
-#CFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../sys
+#CFLAGS+= -I${.CURDIR} -I. -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/sys
ABIS+= freebsd
# Each ABI is expected to have an ABI.c, MACHINE_ARCH-ABI.c or
Index: usr.bin/unvis/Makefile
===================================================================
--- usr.bin/unvis/Makefile
+++ usr.bin/unvis/Makefile
@@ -3,6 +3,6 @@
PROG= unvis
-.PATH: ${.CURDIR}/../../contrib/unvis
+.PATH: ${SRCTOP}/contrib/unvis
.include <bsd.prog.mk>
Index: usr.bin/vacation/Makefile
===================================================================
--- usr.bin/vacation/Makefile
+++ usr.bin/vacation/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/vacation
PROG= vacation
Index: usr.bin/vi/Makefile
===================================================================
--- usr.bin/vi/Makefile
+++ usr.bin/vi/Makefile
@@ -5,7 +5,7 @@
.include <src.opts.mk>
PACKAGE= vi
-SRCDIR= ${.CURDIR}/../../contrib/nvi
+SRCDIR= ${SRCTOP}/contrib/nvi
SUBDIR+= catalog
WARNS?= 0 # some warn issues on 32 bit machines
Index: usr.bin/vis/Makefile
===================================================================
--- usr.bin/vis/Makefile
+++ usr.bin/vis/Makefile
@@ -4,7 +4,7 @@
PROG= vis
SRCS= vis.c foldit.c
-.PATH: ${.CURDIR}/../../contrib/vis
-CFLAGS+= -I${.CURDIR}/../../contrib/vis
+.PATH: ${SRCTOP}/contrib/vis
+CFLAGS+= -I${SRCTOP}/contrib/vis
.include <bsd.prog.mk>
Index: usr.bin/w/Makefile
===================================================================
--- usr.bin/w/Makefile
+++ usr.bin/w/Makefile
@@ -7,6 +7,6 @@
LIBADD= kvm sbuf xo util
LINKS= ${BINDIR}/w ${BINDIR}/uptime
-.PATH: ${.CURDIR}/../../bin/ps
+.PATH: ${SRCTOP}/bin/ps
.include <bsd.prog.mk>
Index: usr.bin/xinstall/Makefile
===================================================================
--- usr.bin/xinstall/Makefile
+++ usr.bin/xinstall/Makefile
@@ -8,9 +8,9 @@
SRCS= xinstall.c getid.c
MAN= install.1
-.PATH: ${.CURDIR}/../../contrib/mtree
-CFLAGS+= -I${.CURDIR}/../../contrib/mtree
-CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
+.PATH: ${SRCTOP}/contrib/mtree
+CFLAGS+= -I${SRCTOP}/contrib/mtree
+CFLAGS+= -I${SRCTOP}/lib/libnetbsd
LIBADD= md
Index: usr.bin/xz/Makefile
===================================================================
--- usr.bin/xz/Makefile
+++ usr.bin/xz/Makefile
@@ -10,8 +10,8 @@
MLINKS= xz.1 unxz.1 xz.1 lzma.1 xz.1 unlzma.1 xz.1 xzcat.1 xz.1 lzcat.1
-XZDIR= ${.CURDIR}/../../contrib/xz/src
-LZMALIBDIR= ${.CURDIR}/../../lib/liblzma
+XZDIR= ${SRCTOP}/contrib/xz/src
+LZMALIBDIR= ${SRCTOP}/lib/liblzma
.PATH: ${XZDIR}/xz
Index: usr.bin/xzdec/Makefile
===================================================================
--- usr.bin/xzdec/Makefile
+++ usr.bin/xzdec/Makefile
@@ -6,8 +6,8 @@
MLINKS= xzdec.1 lzmadec.1
-XZDIR= ${.CURDIR}/../../contrib/xz/src
-LZMALIBDIR= ${.CURDIR}/../../lib/liblzma
+XZDIR= ${SRCTOP}/contrib/xz/src
+LZMALIBDIR= ${SRCTOP}/lib/liblzma
.PATH: ${XZDIR}/xzdec
Index: usr.bin/yacc/Makefile
===================================================================
--- usr.bin/yacc/Makefile
+++ usr.bin/yacc/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
-BYACC_SRC= ${.CURDIR}/../../contrib/byacc
+BYACC_SRC= ${SRCTOP}/contrib/byacc
.PATH: ${BYACC_SRC}
PROG= yacc
Index: usr.bin/ypwhich/Makefile
===================================================================
--- usr.bin/ypwhich/Makefile
+++ usr.bin/ypwhich/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
# $FreeBSD$
-YPSERV=${.CURDIR}/../../usr.sbin/ypserv/common
+YPSERV=${SRCTOP}/usr.sbin/ypserv/common
.PATH: ${YPSERV}
PROG= ypwhich

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 22, 7:02 AM (1 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14771847
Default Alt Text
D9932.id26124.diff (49 KB)

Event Timeline