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

If the user sets SENDMAIL_MC to /etc/mail/sendmail.mc, install is told to

Browse Source 
install /etc/mail/sendmail.cf to /etc/mail/sendmail.cf and exits with an
error:

===> etc/sendmail
install -c -o root -g wheel -m 644 /etc/mail/sendmail.cf /etc/mail/sendmail.cf
install: /etc/mail/sendmail.cf and /etc/mail/sendmail.cf are the same file
*** Error code 64

Catch this in the Makefile and don't call install if the source and target
are the same file.

Reported by:	Alexandr Listopad <laa@reis.zp.ua>
MFC after:	1 week
This commit is contained in:
Gregory Neil Shapiro 2001-07-23 02:19:02 +00:00
parent f4843be999
commit f88f925efc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mail/Makefile
View File

@ -153,7 +153,9 @@ maps: ${SENDMAIL_MAP_OBJ}
aliases: ${SENDMAIL_ALIASES}.db
install: ${INSTALL_CF}
.if ${INSTALL_CF} != /etc/mail/sendmail.cf
${INSTALL} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
.endif
start:
(. /etc/defaults/rc.conf; source_rc_confs; \

12
etc/sendmail/Makefile
View File

@ -38,6 +38,8 @@ INSTALL_CF= ${SENDMAIL_CF}
.endif
.endif
DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf
ALL+= ${INSTALL_CF}
# Additional .cf files to build
@ -57,8 +59,10 @@ install: ${INSTALL_CF}
@false
.endif
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DESTDIR}/etc/mail/sendmail.cf
${DEST_CF}
.endif
.endif
# Helper for src/etc/Makefile
@ -72,11 +76,13 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF}
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DESTDIR}/etc/mail/freebsd.cf
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DESTDIR}/etc/mail/sendmail.cf
${DEST_CF}
.endif
.else
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DESTDIR}/etc/mail/sendmail.cf
${DEST_CF}
.endif
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
${DESTDIR}/etc/mail/helpfile