d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move installation of sendmail helpfile into etc/sendmail/Makefile. It is

Browse Source 
a user configurable file and it would benefit from mergemaster.
This commit is contained in:
gshapiro 2001-03-01 03:50:28 +00:00
parent ac28896429
commit d383ddef28
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/sendmail/Makefile
View File

@ -5,7 +5,10 @@ M4= m4
CHMOD= chmod CHMOD= chmod
ROMODE= 444 ROMODE= 444
RM= rm -f RM= rm -f
CFDIR= ${.CURDIR}/../../contrib/sendmail/cf
SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
CFDIR= ${SENDMAIL_DIR}/cf
# this is overkill, but.... # this is overkill, but....
M4FILES!= find ${CFDIR} -type f -name '*.m4' -print M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
@ -72,6 +75,8 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF}
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DESTDIR}/etc/mail/sendmail.cf ${DESTDIR}/etc/mail/sendmail.cf
.endif .endif
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/sendmail.st ${DESTDIR}/var/log/sendmail.st

4
usr.sbin/sendmail/Makefile
View File

@ -61,10 +61,6 @@ DPADD+=${SENDMAIL_DPADD}
LDADD+=${SENDMAIL_LDADD} LDADD+=${SENDMAIL_LDADD}
LDFLAGS+=${SENDMAIL_LDFLAGS} LDFLAGS+=${SENDMAIL_LDFLAGS}
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile
afterinstall: afterinstall:
@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \ @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/sendmail.cf -a \
! -f ${DESTDIR}/etc/mail/sendmail.cf ]; then \ ! -f ${DESTDIR}/etc/mail/sendmail.cf ]; then \