--- Makefile.orig	Tue Aug  2 02:34:16 1994
+++ Makefile	Tue Dec 23 13:41:28 1997
@@ -9,12 +9,9 @@
 MANDIR= /usr/local/man/man1
 # This is where the man page goes
 
-HTMLDIR= /usr/local/www/software/hypermail
+HTMLDIR= /usr/local/share/doc/hypermail
 # This is where the HTML documentation goes
 
-CGIDIR= /usr/local/httpd/cgi-bin
-# This is where your CGI programs live
-
 CC= cc
 
 # CFLAGS= -O2
@@ -22,8 +19,6 @@
 OBJS=		file.o mem.o string.o print.o \
 		parse.o struct.o date.o hypermail.o
 
-MAILOBJS=	mail.o libcgi/libcgi.a
-
 .c.o:
 		$(CC) -c $(CFLAGS) $<
 
@@ -39,23 +34,19 @@
 libcgi/libcgi.a:
 		cd libcgi; make all CC="$(CC)" CFLAGS="$(CFLAGS)"
 
-mail:		$(MAILOBJS)
-		$(CC) -o mail $(CFLAGS) $(MAILOBJS)
-		chmod 0755 mail
-
 $(OBJS):	Makefile hypermail.h config.h
 
 install:
-		install -cs -m 0755 hypermail $(BINDIR)
-		install -c -m 0644 hypermail.1 $(MANDIR)
+		install -cs -m 0755 -g bin -o bin hypermail $(BINDIR)
+		install -c -m 0644 -g bin -o bin hypermail.1 $(MANDIR)
+		install -d -m 0755 -g wheel -o root $(HTMLDIR)
+		install -c -m 0644 -g bin -o bin hypermail.html $(HTMLDIR)
+		install -c -m 0644 -g bin -o bin hypermail.gif $(HTMLDIR)
 
 html.install:
 		install -c -m 0644 hypermail.html $(HTMLDIR)
 		install -c -m 0644 hypermail.gif $(HTMLDIR)
 
-mail.install:
-		install -c -m 0755 mail $(CGIDIR)
-
 install.alpha:
 		install -c $(BINDIR) -s -m 0755 hypermail
 		install -c $(MANDIR) -m 0644 hypermail.1
@@ -64,9 +55,6 @@
 		install -c $(HTMLDIR) -m 0644 hypermail.html
 		install -c $(HTMLDIR) -m 0644 hypermail.gif
 
-mail.install.alpha:
-		install -c $(CGIDIR) -m 0755 mail
-
 pure:
 	 	make CFLAGS="-g" $(OBJS)
 		purify $(CC) -o hypermail -g $(CFLAGS) $(OBJS)
@@ -76,6 +64,6 @@
 		quantify $(CC) -o hypermail -g $(CFLAGS) $(OBJS)
 
 clean:
-		rm -f ./hypermail ./mail *.o .pure hypermail.pure* *qx *qv
+		rm -f ./hypermail *.o .pure hypermail.pure* *qx *qv
 		rm -fr ./archive
 		cd libcgi; make clean
