--- Makefile.orig	1996-09-03 02:13:20 UTC
+++ Makefile
@@ -12,16 +12,12 @@
 #
 #   3) make install
 
-BIN=/usr/local/bin
-MAN=/usr/local/man
-CC=cc -O
-SHELL=/bin/sh
 
 
 
 all:
 	@echo "Making PAICC ..."
-	@make paicc CFLAGS=" -O" LFLAGS=" -lcurses"
+	@make paicc CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS} -lncurses"
 
 clean:
 	rm -fr paicc.o evap.o paicc
@@ -34,7 +30,7 @@ paicc: paicc.o evap.o
 
 evap.o: evap/evap.h evap/evap.c
 	@echo '  making evap.o ...'
-	$(CC) -DP_EVAP_MM_PATH=\"$(BIN)/paiccmm.a\" -c $$CFLAGS evap/evap.c
+	$(CC) -DP_EVAP_MM_PATH=\"$(PREFIX)/libdata/paiccmm.a\" -c $$CFLAGS evap/evap.c
 
 paicc.o: paicc.c evap.o evap/evap.h evap/paicc_pdt_out
 	@echo '  making paicc.o ...'; \
@@ -46,16 +42,12 @@ install:
 	@echo "Copying and linking PAICC to $(BIN) ..."
 	cp paicc $(BIN)/paicc
 	chmod 755 $(BIN)/paicc
-	-rm -fr $(BIN)/paint_changed_characters
-	-ln -s $(BIN)/paicc $(BIN)/paint_changed_characters
 	@echo "Updating message module archive $(BIN)/paiccmm.a ..."
-	ar rcv $(BIN)/paiccmm.a evap/*.mm
-	ranlib $(BIN)/paiccmm.a
-	chmod 755 $(BIN)/paiccmm.a
+	ar rcv $(DATA)/paiccmm.a evap/*.mm
+	ranlib $(DATA)/paiccmm.a
+	chmod 755 $(DATA)/paiccmm.a
 	cp paicc.1 $(MAN)/man1/paicc.1
 	chmod 755 $(MAN)/man1/paicc.1
-	-rm -fr $(MAN)/man1/paint_changed_characters.1
-	-ln -s $(MAN)/man1/paicc.1 $(MAN)/man1/paint_changed_characters.1
 
 # Unix flavor-dependent section!