Date: Sun, 12 Mar 2017 18:58:55 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315171 - in head/etc: . sendmail Message-ID: <201703121858.v2CIwtI1001709@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Mar 12 18:58:55 2017 New Revision: 315171 URL: https://svnweb.freebsd.org/changeset/base/315171 Log: Move /etc/ to SRCTOP Prefer ${SRCTOP}/ to ${.CURDIR}/../ and ${.CURDIR}/../../ as appropriate. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice) Modified: head/etc/Makefile head/etc/sendmail/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sun Mar 12 18:58:44 2017 (r315170) +++ head/etc/Makefile Sun Mar 12 18:58:55 2017 (r315171) @@ -64,7 +64,7 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys .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 @@ BIN1+= inetd.conf .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 @@ BIN1+= hosts.lpd printcap .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 @@ BIN1+= ntp.conf .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 @@ DESTDIR:= ${DESTDIR:C://*:/:g} afterinstall: .if ${MK_MAN} != "no" - ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb + ${_+_}cd ${SRCTOP}/share/man; ${MAKE} makedb .endif distribute: @@ -263,8 +263,8 @@ distribution: ${_+_}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 @@ distribution: 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 Modified: head/etc/sendmail/Makefile ============================================================================== --- head/etc/sendmail/Makefile Sun Mar 12 18:58:44 2017 (r315170) +++ head/etc/sendmail/Makefile Sun Mar 12 18:58:55 2017 (r315171) @@ -6,7 +6,7 @@ CHMOD= chmod 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703121858.v2CIwtI1001709>