--- Makefile.orig	Fri Aug  1 05:00:30 1997
+++ Makefile	Tue Oct  7 11:13:59 1997
@@ -1,30 +1,29 @@
 #$Id: Makefile,v 1.3 1997/08/01 01:00:30 srb Exp $
 
-BASENAME= /usr
+BASENAME= $(PREFIX)
 
 GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
  -Wpointer-arith -Wconversion -Waggregate-return \
  #-Wimplicit -Wshadow #-Wuninitialized
 
-CFLAGS	= -O #$(GCC_WARNINGS)
-LDFLAGS =
+#CFLAGS	= -O #$(GCC_WARNINGS)
+LDFLAGS += -lcrypt -lmd
 
 O=o
 
-BINDIR=$(BASENAME)/sbin
+BINDIR=$(BASENAME)/libexec
 MANDIR=$(BASENAME)/man/man8
 
-INSTALL=install -o root -m
-BINPERM=02755 -s -g mail
-REGPERM=0644
+INSTALL=install -o bin -m
+BINPERM=02555 -s -g mail
+REGPERM=0444 -g bin
 
 #
 # When compiling without APOP support, the md5 library can be omitted.
 
 MD5_OBJ=md5/md5c.$(O)
 
-OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
-	$(MD5_OBJ)
+OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
 
 all: cucipop
 
--- authenticate.c.orig	Fri Aug  1 05:00:31 1997
+++ authenticate.c	Tue Oct  7 11:14:31 1997
@@ -36,7 +36,7 @@
 #include "authenticate.h"
 
 #ifndef MAILSPOOLDIR
-#define MAILSPOOLDIR	"/var/spool/mail/"	     /* watch the trailing / */
+#define MAILSPOOLDIR	"/var/mail/"		     /* watch the trailing / */
 #endif
 #ifndef MAILSPOOLHASH
 #define MAILSPOOLHASH	0      /* 2 would deliver to /var/spool/mail/b/a/bar */
--- xcreat.c.orig	Thu Apr  3 05:53:24 1997
+++ xcreat.c	Tue Oct  7 11:14:56 1997
@@ -22,7 +22,7 @@
 /*#define NOuname		      /* uncomment if uname is not available */
 /*#define NOstrpbrk		    /* uncomment if strpbrk is not available */
 /*#define strchr(s,c) index(s,c)     /* uncomment if strchr is not available */
-#define const			      /* can be undefined for ANSI compilers */
+/*#define const			      /* can be undefined for ANSI compilers */
 
 #include <unistd.h>			/* open() close() link() unlink()
 					   getpid() */

--- config.h.orig	Fri Aug  1 05:13:05 1997
+++ config.h	Tue Oct  7 11:40:43 1997
@@ -3,7 +3,7 @@
 #define USEdot_lock	/**/
 /*#define USEfcntl_lock /**/	    /* to test which combinations make sense */
 /*#define USElockf	/**/	      /* run the lockingtest program part of */
-/*#define USEflock	/**/		/* the procmail installation process */
+#define USEflock	/**/		/* the procmail installation process */
 
 /*#define SHADOW_PASSWD /**/		  /* shadow password library support */