Fix build after r337849
This moves the symlink creation to after where the files are installed. This also inverts the shell change so that it only happens if MK_TCSH is on. Approved by: will (mentor) Differential Revision: https://reviews.freebsd.org/D16725
This commit is contained in:
parent
59b2022f94
commit
1da0bddb6d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=337857
@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
|
|||||||
|
|
||||||
LIBADD= termcapw crypt
|
LIBADD= termcapw crypt
|
||||||
|
|
||||||
LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
|
LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
|
||||||
/root/.cshrc /.cshrc
|
|
||||||
|
|
||||||
CLEANFILES= ${GENHDRS} gethost csh.1
|
CLEANFILES= ${GENHDRS} gethost csh.1
|
||||||
|
|
||||||
@ -158,7 +157,7 @@ beforeinstall:
|
|||||||
rm -f ${DESTDIR}/.cshrc
|
rm -f ${DESTDIR}/.cshrc
|
||||||
|
|
||||||
afterinstallconfig:
|
afterinstallconfig:
|
||||||
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
|
sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
|
||||||
pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
|
pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -37,7 +37,6 @@ WFORMAT=0
|
|||||||
|
|
||||||
CLEANFILES+= mknodes mksyntax
|
CLEANFILES+= mknodes mksyntax
|
||||||
CLEANFILES+= ${GENSRCS} ${GENHDRS}
|
CLEANFILES+= ${GENSRCS} ${GENHDRS}
|
||||||
LINKS= /root/.profile /.profile
|
|
||||||
|
|
||||||
build-tools: mknodes mksyntax
|
build-tools: mknodes mksyntax
|
||||||
|
|
||||||
@ -67,4 +66,7 @@ SUBDIR.${MK_TESTS}+= tests
|
|||||||
beforeinstall:
|
beforeinstall:
|
||||||
rm -f ${DESTDIR}/.profile
|
rm -f ${DESTDIR}/.profile
|
||||||
|
|
||||||
|
afterinstallconfig:
|
||||||
|
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
#
|
||||||
root::0:0::0:0:Charlie &:/root:/bin/csh
|
root::0:0::0:0:Charlie &:/root:/bin/sh
|
||||||
toor:*:0:0::0:0:Bourne-again Superuser:/root:
|
toor:*:0:0::0:0:Bourne-again Superuser:/root:
|
||||||
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
|
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
|
||||||
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
|
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
|
||||||
|
Loading…
Reference in New Issue
Block a user