--- Makefile.orig	Mon Sep  2 19:13:20 1996
+++ Makefile	Sat Apr 28 16:34:34 2001
@@ -13,8 +13,8 @@
 #   3) make install
 
-BIN=/usr/local/bin
-MAN=/usr/local/man
-CC=cc -O
-SHELL=/bin/sh
+#BIN=/usr/local/bin
+#MAN=/usr/local/man
+#CC=cc -O
+#SHELL=/bin/sh
 
 
@@ -22,5 +22,5 @@
 all:
 	@echo "Making PAICC ..."
-	@make paicc CFLAGS=" -O" LFLAGS=" -lcurses"
+	@make paicc CFLAGS="${CFLAGS}" LFLAGS=" -lcurses"
 
 clean:
@@ -35,5 +35,5 @@
 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=\"$(DATA)/paiccmm.a\" -c $$CFLAGS evap/evap.c
 
 paicc.o: paicc.c evap.o evap/evap.h evap/paicc_pdt_out
@@ -47,14 +47,10 @@
 	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!
