diff -Nurd -x'*~' procmail-3.22.orig/Makefile procmail-3.22/Makefile --- procmail-3.22.orig/Makefile 2001-09-11 00:53:09.000000000 -0400 +++ procmail-3.22/Makefile 2004-03-06 20:14:59.000000000 -0500 @@ -11,7 +11,7 @@ #ARCHITECTURE =.sun4 BINDIR_TAIL = bin$(ARCHITECTURE) -MANDIR = $(BASENAME)/man +MANDIR = $(BASENAME)/share/man BINDIR = $(BASENAME)/$(BINDIR_TAIL) VISIBLE_BINDIR = $(VISIBLE_BASENAME)/$(BINDIR_TAIL) # MAN1SUFFIX for regular utility manuals @@ -53,9 +53,9 @@ # Makefile.0 - mark, don't (re)move this, a sed script needs it -LOCKINGTEST=__defaults__ +#LOCKINGTEST=__defaults__ -#LOCKINGTEST=/tmp . # Uncomment and add any directories you see fit. +LOCKINGTEST=/tmp # Uncomment and add any directories you see fit. # If LOCKINGTEST is defined, autoconf will NOT # prompt you to enter additional directories. # See INSTALL for more information about the @@ -79,7 +79,7 @@ # -lresolv # not really needed, is it? # Informal list of directories where we look for the libraries in SEARCHLIBS -LIBPATHS=/lib /usr/lib /usr/local/lib +LIBPATHS=/usr/lib GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat -Wtraditional \ -Wpointer-arith -Wconversion -Waggregate-return \ diff -Nurd -x'*~' procmail-3.22.orig/config.h procmail-3.22/config.h --- procmail-3.22.orig/config.h 2001-09-11 00:53:50.000000000 -0400 +++ procmail-3.22/config.h 2004-03-06 20:39:11.000000000 -0500 @@ -33,8 +33,8 @@ * override those settings you should uncomment and possibly change the * DEFSPATH and DEFPATH defines below */ -/*#define DEFSPATH "PATH=/bin:/usr/bin" /* */ -/*#define DEFPATH "PATH=$HOME/bin:/bin:/usr/bin" /* */ +#define DEFSPATH "PATH=@PREFIX@/sbin:@PREFIX@/sbin:/usr/bin:/bin:/usr/sbin" +#define DEFPATH "PATH=$HOME/bin:@PREFIX@/sbin:@PREFIX@/sbin:/usr/bin:/bin:/usr/sbin" /* every environment variable appearing in PRESTENV will be set or wiped * out of the environment (variables without an '=' sign will be thrown @@ -116,11 +116,11 @@ is not found, maildelivery will proceed as normal to the default system mailbox. This also must be an absolute path */ -#define ETCRC "/etc/procmailrc" /* optional global procmailrc startup +#define ETCRC "@PREFIX@/etc/procmailrc" /* optional global procmailrc startup file (will only be read if procmail is started with no rcfile on the command line). */ -#define ETCRCS "/etc/procmailrcs/" /* optional trusted path prefix for +#define ETCRCS "@PREFIX@/etc/procmailrcs/" /* optional trusted path prefix for rcfiles which will be executed with the uid of the owner of the rcfile (this only happens if procmail is called with the -m option, without variable assignments on the command