diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index b11e2e92dcbf..18f89191d399 100644 --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -1,32 +1,32 @@ # $FreeBSD$ PACKAGE=at -MAINSRC=${.CURDIR}/../../usr.bin/at +MAINSRC=${SRCTOP}/usr.bin/at .include "${MAINSRC}/Makefile.inc" PROG= atrun SRCS= atrun.c gloadavg.c MAN= atrun.8 BINDIR= ${ATLIB_DIR} CLEANFILES= ${MAN} CFLAGS+=-I${MAINSRC} -I${.CURDIR} CFLAGS+=-DLOGIN_CAP -DPAM WARNS?= 2 WFORMAT=0 LIBADD= pam util atrun.8: atrun.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ sed -e \ "s@_ATSPOOL_DIR@$(ATSPOOL_DIR)@g; \ s@_ATJOB_DIR@$(ATJOB_DIR)@g; \ s@_ATLIB_DIR@$(ATLIB_DIR)@g; \ s@_LOADAVG_MX@$(LOADAVG_MX)@g;" \ < ${.ALLSRC} > ${.TARGET} .include diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc index b24f85d7044c..8e88f832ee99 100644 --- a/libexec/dma/Makefile.inc +++ b/libexec/dma/Makefile.inc @@ -1,14 +1,14 @@ # $FreeBSD$ -.sinclude "${.CURDIR}/../../Makefile.inc" -DMA_SOURCES= ${.CURDIR}/../../../contrib/dma +.sinclude "${.CURDIR:H:H}/Makefile.inc" +DMA_SOURCES= ${SRCTOP}/contrib/dma .PATH: ${DMA_SOURCES} CFLAGS+= -I${DMA_SOURCES} \ -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \ -DCONF_PATH='"/etc/dma"' \ -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.11+"' \ -DDMA_ROOT_USER='"mailnull"' \ -DDMA_GROUP='"mail"' BINGRP= mail PACKAGE= dma diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index b945e55d7988..7d6f5bde445e 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,43 +1,42 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 # $FreeBSD$ .include PROG= ftpd MAN= ftpd.8 ftpchroot.5 SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING CFLAGS+=-I${.CURDIR} YFLAGS= WARNS?= 2 WFORMAT=0 LIBADD= crypt xo util # XXX Kluge! Conversation mechanism needs to be fixed. LIBADD+= opie md -LSDIR= ../../bin/ls -.PATH: ${.CURDIR}/${LSDIR} +.PATH: ${SRCTOP}/bin/ls SRCS+= ls.c cmp.c print.c util.c -CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} +CFLAGS+=-Dmain=ls_main -I${SRCTOP}/bin/ls LIBADD+= m .if ${MK_BLACKLIST_SUPPORT} != "no" CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM LIBADD+= pam .endif .include diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile index a8414771d8ab..a89b7435d2e5 100644 --- a/libexec/hyperv/Makefile +++ b/libexec/hyperv/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/hyperv/tools/scripts +.PATH: ${SRCTOP}/contrib/hyperv/tools/scripts BINDIR= ${LIBEXECDIR}/hyperv SCRIPTS= hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info .include diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 6b4256f8a091..a642326228b2 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,30 +1,30 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local PROG= mail.local SRCS= mail.local.c MAN= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include -I. WARNS?= 2 WFORMAT=0 LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 02590ae61ed5..dc4f7c210695 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,29 +1,29 @@ # @(#)Makefile 8.1 (Berkeley) 7/2/95 # $FreeBSD$ PACKAGE=sendmail -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh PROG= smrsh SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. LIBADD= sm WARNS?= 2 SRCS+= sm_os.h CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .include diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile index cc0c5977fb7d..280d828d5248 100644 --- a/libexec/talkd/Makefile +++ b/libexec/talkd/Makefile @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PROG= ntalkd SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c -.PATH: ${.CURDIR}/../../usr.bin/wall +.PATH: ${SRCTOP}/usr.bin/wall MAN= talkd.8 -CFLAGS+=-I${.CURDIR}/../../usr.bin/wall +CFLAGS+=-I${SRCTOP}/usr.bin/wall .include diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index 45add0bd95c8..7a4eb339c45b 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -1,22 +1,22 @@ # $FreeBSD$ .include -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers +.PATH: ${SRCTOP}/contrib/tcp_wrappers PROG= tcpd MAN= tcpd.8 CSTD?= c89 CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \ -DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \ -DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \ -DFACILITY=LOG_DAEMON .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif LIBADD= wrap WARNS?= 1 .include diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 7cb9bc972ce2..6c953ddbd1d4 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,45 +1,45 @@ # $FreeBSD$ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. .include -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnetd PROG= telnetd MAN= telnetd.8 SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c WARNS?= 2 WFORMAT?= 0 CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DSTREAMSPTY .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif CFLAGS+= -I${TELNETDIR} CFLAGS+= -I${TELNETDIR}/telnet -LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a +LIBTELNET= ${OBJTOP}/lib/libtelnet/libtelnet.a LIBADD= telnet util ncursesw .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION LIBADD+= mp crypto pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write LIBADD+= krb5 roken .endif .include diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile index d8541c4b818e..596ca26cb61c 100644 --- a/libexec/tftp-proxy/Makefile +++ b/libexec/tftp-proxy/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/tftp-proxy +.PATH: ${SRCTOP}/contrib/pf/tftp-proxy PROG= tftp-proxy SRCS= tftp-proxy.c filter.c MAN= tftp-proxy.8 WARNS?= 3 .include diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index d1a2f573a823..c4472fb167ce 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -1,46 +1,46 @@ # $FreeBSD$ PROG= ypxfr SRCS= yp_dblookup.c yp_dbwrite.c yp_error.c \ ypxfr_getmap.c ypxfr_main.c ypxfr_misc.c \ ypxfrd_getmap.c \ ${GENSRCS} GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c -.PATH: ${.CURDIR}/../../usr.sbin/ypserv +.PATH: ${SRCTOP}/usr.sbin/ypserv MAN= ypxfr.8 CFLAGS+= -I. WARNS?= 2 WFORMAT=0 LIBADD= rpcsvc CLEANFILES= ${GENSRCS} -RPCDIR= ${.CURDIR}/../../include/rpcsvc +RPCDIR= ${SRCTOP}/include/rpcsvc RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C ypxfr_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPPUSH_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp_clnt.c: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -DYPSERV_ONLY -l -o ${.TARGET} ${RPCDIR}/yp.x yp.h: ${RPCDIR}/yp.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x # ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x # rm -f ${.TARGET} # ${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/ypxfrd.x ypxfrd.h: ${RPCDIR}/ypxfrd.x rm -f ${.TARGET} ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x .include