Style fixes: tab after a dependency operator should be a single space

second level indent of tab should be four spaces

Submitted by:	ru
MFC after:	3 days
This commit is contained in:
Gregory Neil Shapiro 2003-07-06 18:07:06 +00:00
parent fa8ee6aca1
commit 043fc4cb15
2 changed files with 29 additions and 29 deletions

View File

@ -44,7 +44,7 @@
# This Makefile uses `<HOSTNAME>.mc' as the default MTA .mc file. This
# can be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.:
#
# SENDMAIL_MC=/etc/mail/myconfig.mc
# SENDMAIL_MC=/etc/mail/myconfig.mc
#
# If '<HOSTNAME>.mc' does not exist, it is created using 'freebsd.mc'
# as a template.
@ -53,7 +53,7 @@
# This can be changed by defining SENDMAIL_SUBMIT_MC in /etc/make.conf,
# e.g.:
#
# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
# ------------------------------------------------------------------------
#
# The Makefile knows about the following maps:
@ -105,7 +105,7 @@ M4?= /usr/bin/m4
SENDMAIL_MAP_PERMS?= 0640
# Set a reasonable default
.MAIN: all
.MAIN: all
#
# ------------------------------------------------------------------------
@ -131,16 +131,16 @@ SENDMAIL_MAP_OBJ+= ${_f}.db
#
.for _f in ${SENDMAIL_MAP_SRC}
.if (exists(${_f}.sample) && !exists(${_f}))
${_f}: ${_f}.sample
${_f}: ${_f}.sample
sed -e 's/^/#/' < ${.OODATE} > ${.TARGET}
.endif
${_f}.db: ${_f}
${_f}.db: ${_f}
${MAKEMAP} ${SENDMAIL_MAP_TYPE} ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
userdb.db: userdb
userdb.db: userdb
${MAKEMAP} btree ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
@ -153,18 +153,18 @@ M4FILES!= find ${SENDMAIL_CF_DIR} -type f -name '*.m4' -print
#
# M4(1) is used to generate the .cf file from the .mc file.
#
.SUFFIXES: .cf .mc
.SUFFIXES: .cf .mc
.mc.cf: ${M4FILES}
.mc.cf: ${M4FILES}
${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
#
# Aliases are handled separately since they normally reside in /etc
# and can be rebuild without the help of makemap.
#
.for _f in ${SENDMAIL_ALIASES}
${_f}.db: ${_f}
${_f}.db: ${_f}
${SENDMAIL} -bi -OAliasFile=${.ALLSRC}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
@ -173,13 +173,13 @@ ${_f}.db: ${_f}
# ------------------------------------------------------------------------
#
all: cf maps aliases
all: cf maps aliases
clean:
depend:
cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
install: install-cf
@ -187,13 +187,13 @@ install: install-cf
install: install-cf install-submit-cf
.endif
install-cf: ${INSTALL_CF}
install-cf: ${INSTALL_CF}
.if ${INSTALL_CF} != /etc/mail/sendmail.cf
${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
.endif
install-submit-cf: ${INSTALL_SUBMIT_CF}
install-submit-cf: ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
@echo ">>> ERROR: You should not create a submit.cf file if you are using a"
@echo " set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set"
@ -205,9 +205,9 @@ install-submit-cf: ${INSTALL_SUBMIT_CF}
.endif
.endif
aliases: ${SENDMAIL_ALIASES:%=%.db}
aliases: ${SENDMAIL_ALIASES:%=%.db}
maps: ${SENDMAIL_MAP_OBJ}
maps: ${SENDMAIL_MAP_OBJ}
start start-mta start-mspq:
@if [ -r ${SENDMAIL_START_SCRIPT} ]; then \

View File

@ -13,9 +13,9 @@ CFDIR= ${SENDMAIL_DIR}/cf
# this is overkill, but....
M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
.SUFFIXES: .mc .cf
.SUFFIXES: .mc .cf
.mc.cf: ${M4FILES}
.mc.cf: ${M4FILES}
${RM} ${.TARGET}
(cd ${.CURDIR} && \
${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
@ -69,11 +69,11 @@ ALL+= ${SENDMAIL_ADDITIONAL_CF}
CLEANFILES+= ${SENDMAIL_ADDITIONAL_CF}
.endif
all: ${ALL}
all: ${ALL}
depend:
install: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
install: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
@false
@ -81,40 +81,40 @@ install: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DEST_CF}
${DEST_CF}
.endif
.endif
.if defined(SENDMAIL_ADDITIONAL_CF)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
.endif
.ifndef SENDMAIL_SET_USER_ID
.if defined(INSTALL_SUBMIT_CF)
.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
.endif
.endif
.endif
# Helper for src/etc/Makefile
distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
@echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
@false
.endif
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \
${DESTDIR}/etc/mail/freebsd.mc
${DESTDIR}/etc/mail/freebsd.mc
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DESTDIR}/etc/mail/freebsd.cf
${DESTDIR}/etc/mail/freebsd.cf
.if defined(INSTALL_CF)
.if ${INSTALL_CF} != ${DEST_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
${DEST_CF}
${DEST_CF}
.endif
.else
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
${DEST_CF}
${DEST_CF}
.endif
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \
${DESTDIR}/etc/mail/freebsd.submit.mc
@ -124,7 +124,7 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.if defined(INSTALL_SUBMIT_CF)
.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
.endif
.else
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \