57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
diff --git a/cf/cf/Makefile b/cf/cf/Makefile
|
|
index 00b75a8..68256df 100644
|
|
--- a/cf/cf/Makefile
|
|
+++ b/cf/cf/Makefile
|
|
@@ -80,10 +80,12 @@ install:
|
|
install-cf: install-sendmail-cf install-submit-cf
|
|
|
|
install-sendmail-cf: $(CF).cf
|
|
- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
|
|
+ # $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
|
|
+ $(INSTALL) -c -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
|
|
|
|
install-submit-cf: $(SUBMIT).cf
|
|
- $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
|
|
+ # $(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
|
|
+ $(INSTALL) -c -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
|
|
|
|
depend:
|
|
|
|
diff --git a/cf/domain/linux-msp.m4 b/cf/domain/linux-msp.m4
|
|
diff --git a/cf/ostype/linux.m4 b/cf/ostype/linux.m4
|
|
index 9d2282a..88222c5 100644
|
|
--- a/cf/ostype/linux.m4
|
|
+++ b/cf/ostype/linux.m4
|
|
@@ -15,6 +15,11 @@ divert(-1)
|
|
divert(0)
|
|
VERSIONID(`$Id: linux.m4,v 8.14 2013-11-22 20:51:15 ca Exp $')
|
|
define(`confEBINDIR', `/usr/sbin')
|
|
-ifdef(`PROCMAIL_MAILER_PATH',,
|
|
- define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail'))
|
|
-FEATURE(local_procmail)
|
|
+#ifdef(`PROCMAIL_MAILER_PATH',,
|
|
+# define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail'))
|
|
+#FEATURE(local_procmail)
|
|
+ifdef(LOCAL_MAILER_PATH,, define(`LOCAL_MAILER_PATH', `/usr/sbin/mail.local'))
|
|
+dnl ifdef(`PROCMAIL_MAILER_PATH',,
|
|
+dnl define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail'))
|
|
+dnl FEATURE(local_procmail)
|
|
+FEATURE(local_lmtp)
|
|
diff --git a/cf/sendmail b/cf/sendmail
|
|
diff --git a/devtools/OS/Linux b/devtools/OS/Linux
|
|
old mode 100644
|
|
new mode 100755
|
|
index bc02f82..d3baf98
|
|
--- a/devtools/OS/Linux
|
|
+++ b/devtools/OS/Linux
|
|
@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/Site/site.config.m4
|
|
define(`confDEPEND_TYPE', `CC-M')
|
|
define(`confCCOPTS_SO', `-fPIC')
|
|
define(`confSM_OS_HEADER', `sm_os_linux')
|
|
-define(`confMANROOT', `/usr/man/man')
|
|
+define(`confMANROOT', `/usr/share/man/man')
|
|
define(`confLIBS', `-ldl')
|
|
define(`confEBINDIR', `/usr/sbin')
|
|
APPENDDEF(`confLIBSEARCH', `crypt nsl')
|
|
diff --git a/etc/mail/access b/etc/mail/access
|