*** Makefile.old	Sat Oct 15 23:06:26 1994
--- Makefile	Sat Jan 21 03:04:40 1995
***************
*** 13,28 ****
  #
  #SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"'
  
  DEFINES =
  
! CC = cc
! CFLAGS = $(DEFINES) -I. "-DVERSION=\"`cat version`\""
  
  LDFLAGS =
  
  TARGETS =	blindness_assist pgpsendmail pgpdaemon sendpgppass pgppipe
  
! all:	$(TARGETS) clean
  
  BLINDNESS_ASSIST_OBJ =	blindness_assist.o
  
--- 13,29 ----
  #
  #SENDMAIL = '-DSENDMAIL="/usr/lib/sendmail"'
  
+ PREFIX = /usr/local
+ 
  DEFINES =
  
! CFLAGS += $(DEFINES) -I. "-DVERSION=\"`cat version`\""
  
  LDFLAGS =
  
  TARGETS =	blindness_assist pgpsendmail pgpdaemon sendpgppass pgppipe
  
! all:    $(TARGETS)
  
  BLINDNESS_ASSIST_OBJ =	blindness_assist.o
  
***************
*** 39,55 ****
  pgpsendmail.o:	pgpsendmail.c
  	$(CC) $(CFLAGS) $(SENDMAIL) -c pgpsendmail.c
  
  pgpsendmail:	$(PGPSENDMAIL_OBJ)
  	$(CC) -s -o pgpsendmail $(PGPSENDMAIL_OBJ) $(LDFLAGS)
  	@-./blindness_assist
- 	-./install pgpsendmail
  
  
  PGPDAEMON_OBJ =	pgpdaemon.o spawn.o strings.o memory.o misc.o
  
  pgpdaemon:	$(PGPDAEMON_OBJ)
  	$(CC) -s -o pgpdaemon $(PGPDAEMON_OBJ) $(LDFLAGS)
- 	-./install pgpdaemon
  
  
  SENDPGPPASS_OBJ =	sendpgppass.o conn_to_pgpd.o strings.o spawn.o \
--- 40,55 ----
  pgpsendmail.o:	pgpsendmail.c
  	$(CC) $(CFLAGS) $(SENDMAIL) -c pgpsendmail.c
  
+ 
  pgpsendmail:	$(PGPSENDMAIL_OBJ)
  	$(CC) -s -o pgpsendmail $(PGPSENDMAIL_OBJ) $(LDFLAGS)
  	@-./blindness_assist
  
  
  PGPDAEMON_OBJ =	pgpdaemon.o spawn.o strings.o memory.o misc.o
  
  pgpdaemon:	$(PGPDAEMON_OBJ)
  	$(CC) -s -o pgpdaemon $(PGPDAEMON_OBJ) $(LDFLAGS)
  
  
  SENDPGPPASS_OBJ =	sendpgppass.o conn_to_pgpd.o strings.o spawn.o \
***************
*** 57,72 ****
  
  sendpgppass:	$(SENDPGPPASS_OBJ)
  	$(CC) -s -o sendpgppass $(SENDPGPPASS_OBJ) $(LDFLAGS)
- 	-./install sendpgppass
  
  
  PGPPIPE_OBJ =	pgppipe.o conn_to_pgpd.o memory.o misc.o
  
  pgppipe:	$(PGPPIPE_OBJ)
  	$(CC) -s -o pgppipe $(PGPPIPE_OBJ) $(LDFLAGS)
- 	-./install pgppipe
  
  
  clean:
  	rm -f *.BAK *.log *.sed .#* *~ *.bak */*.bak */tmp* .*defaults */*~
  	-chmod u+rw,go-w * 2> /dev/null
--- 57,80 ----
  
  sendpgppass:	$(SENDPGPPASS_OBJ)
  	$(CC) -s -o sendpgppass $(SENDPGPPASS_OBJ) $(LDFLAGS)
  
  
  PGPPIPE_OBJ =	pgppipe.o conn_to_pgpd.o memory.o misc.o
  
  pgppipe:	$(PGPPIPE_OBJ)
  	$(CC) -s -o pgppipe $(PGPPIPE_OBJ) $(LDFLAGS)
  
  
+ all_install:
+ 	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpsendmail $(PREFIX)/lib
+ 	$(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpsendmail.8 $(PREFIX)/man/man8
+ 	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgpdaemon $(PREFIX)/bin
+ 	$(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgpdaemon.8 $(PREFIX)/man/man8
+ 	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) pgppipe $(PREFIX)/bin
+ 	$(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/pgppipe.1 $(PREFIX)/man/man1
+ 	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) sendpgppass $(PREFIX)/bin
+ 	$(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 doc/sendpgppass.1 $(PREFIX)/man/man1
+ 
  clean:
  	rm -f *.BAK *.log *.sed .#* *~ *.bak */*.bak */tmp* .*defaults */*~
  	-chmod u+rw,go-w * 2> /dev/null
***************
*** 88,90 ****
--- 96,99 ----
  memory.o:	pgpsendmail.h	karma.h
  pgppipe.o:	pgpsendmail.h	karma.h	version
  misc.o:		pgpsendmail.h	karma.h
+ blindness_assist.o: pgpsendmail.h