--- Makefile.orig	Wed May 13 01:09:14 1998
+++ Makefile	Mon Mar 29 06:29:31 1999
@@ -1,30 +1,32 @@
 #$Id: Makefile,v 1.18 1998/05/12 21:09:14 srb Exp $
 
-BASENAME= /usr
+BASENAME= $(PREFIX)
 
-GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
- -Wpointer-arith -Wconversion -Waggregate-return \
+#CC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
+# -Wpointer-arith -Wconversion -Waggregate-return \
  #-Wimplicit -Wshadow #-Wuninitialized
 
 #
 # Omit USE_DB if you don't have the -ldb2 library (Berkeley DB, v2.x)
 # WARNING: bulletins are not remembered to have been deleted without USE_DB
 
-CFLAGS	= -O -DUSE_DB #$(GCC_WARNINGS)
-LDFLAGS = -lcrypt -ldb2
+#CFLAGS  += -DUSE_DB -DSENDMAILLIB=\"${PREFIX}/etc\" -I${PREFIX}/include
+LDFLAGS += -lcrypt #-lmd -L${PREFIX}/lib -ldb2
 
 # If you change this, edit config.h as well
-CUCIPOPLIB=/var/lib/cucipop
+CUCIPOPLIB=/var/spool/cucipop
 CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
 
 O=o
 
 BINDIR=$(BASENAME)/sbin
+LIBEXECDIR=$(BASENAME)/libexec
 MANDIR=$(BASENAME)/man/man8
 
-INSTALL=install -o root -m
-BINPERM=02755 -s -g mail
-REGPERM=0644
+INSTALL=install -c -o bin -m
+BINLPERM=02555 -s -g mail
+BINSPERM=555 -s
+REGPERM=0444
 
 #
 # When compiling without APOP support, the md5 library can be omitted.
@@ -32,13 +34,14 @@
 MD5_OBJ=md5/md5c.$(O)
 
 OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
-	dbops.$(O) hsort.$(O) simplecrypt.$(O) $(MD5_OBJ)
+	dbops.$(O) hsort.$(O) simplecrypt.$(O)
 
-BINS=cucipop makevpopdb
+BINL=cucipop
+BINS=makevpopdb
 
-MANS=cucipop.8 makevpopdb.8
+MANS=cucipop.8 #makevpopdb.8
 
-all: $(BINS)
+all: $(BINL) #$(BINS)
 
 cucipop: $(OBJS)
 	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
@@ -67,12 +70,14 @@
 $(MD5_OBJ): md5/md5c.c md5/md5.h
 	cd md5; $(CC) $(CFLAGS) -c md5c.c
 
-install: $(BINS) $(MANS)
-	$(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
+install: $(BINL) $(MANS) #$(BINS)
+	$(INSTALL) $(BINLPERM) $(BINL) $(LIBEXECDIR)
+#        $(INSTALL) $(BINSPERM) $(BINS) $(BINDIR)
 	$(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
-	mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0
-	mkdir $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
-	@for a in $(BINS); do ls -l $(BINDIR)/$$a; done
+	mkdir -p $(CUCIPOPLIB) 2>/dev/null; exit 0
+	mkdir -p $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
+	@for a in $(BINL); do ls -l $(LIBEXECDIR)/$$a; done
+#        @for a in $(BINS); do ls -l $(BINDIR)/$$a; done
 	@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
 
 deinstall: