Finish moving dot.cshrc and dot.profile to bin/csh/ and bin/sh/.

Approved by:	re (gjb), will (mentor)
Differential Revision:	https://reviews.freebsd.org/D16770
This commit is contained in:
Brad Davis 2018-08-29 16:59:19 +00:00
parent bc0e855bd9
commit 94ec7ec758
5 changed files with 17 additions and 14 deletions

View File

@ -10,8 +10,9 @@
CONFGROUPS= ETC ROOT CONFGROUPS= ETC ROOT
ETC= csh.cshrc csh.login csh.logout ETC= csh.cshrc csh.login csh.logout
ROOT= dot.login ROOT= dot.cshrc dot.login
ROOTDIR= /root ROOTDIR= /root
ROOTNAME_dot.cshrc= .cshrc
ROOTNAME_dot.login= .login ROOTNAME_dot.login= .login
PACKAGE=runtime PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh TCSHDIR= ${SRCTOP}/contrib/tcsh
@ -153,4 +154,10 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD
sort >> ${.TARGET} sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET} @echo '#endif /* _h_tc_const */' >> ${.TARGET}
beforeinstallconfig:
rm -f ${DESTDIR}/.cshrc
afterinstallconfig:
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -3,7 +3,9 @@
.include <src.opts.mk> .include <src.opts.mk>
CONFS= profile CONFS= dot.profile profile
CONFSDIR_dot.profile= /root
CONFSNAME_dot.profile= .profile
PACKAGE=runtime PACKAGE=runtime
PROG= sh PROG= sh
INSTALLFLAGS= -S INSTALLFLAGS= -S
@ -61,4 +63,10 @@ token.h: mktokens
HAS_TESTS= HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TESTS}+= tests
beforeinstallconfig:
rm -f ${DESTDIR}/.profile
afterinstallconfig:
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -155,18 +155,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login; dot.k5login ${DESTDIR}/root/.k5login;
.endif .endif
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.profile ${DESTDIR}/root/.profile; \
rm -f ${DESTDIR}/.profile; \
${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.if ${MK_TCSH} != "no"
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
rm -f ${DESTDIR}/.cshrc; \
${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.endif
.if ${MK_MAIL} != "no" .if ${MK_MAIL} != "no"
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \