--- Makefile.orig	Sun May 25 06:38:24 2003
+++ Makefile	Sat Mar 13 06:58:00 2004
@@ -1,10 +1,10 @@
 ### Configuration section
 
 # The laguages you're interested in, besides English
-LANGUAGES=-DFRENCH #-DSPANISH -DITALIAN -DGERMAN -DPORTUGUESE -DJAPANESE
+LANGUAGES=-DFRENCH -DSPANISH -DITALIAN -DGERMAN -DPORTUGUESE -DJAPANESE -DRUSSIAN
 
 # How to invoke the C preprocessor
-CPP=gcc -E -P $(LANGUAGES) -
+CPP=cpp -P $(LANGUAGES) -
 
 # Where to install the binary
 BINDIR=/usr/local/bin
@@ -30,9 +30,9 @@
 all: spamoracle
 
 install:
-	cp spamoracle $(BINDIR)/spamoracle
-	cp spamoracle.1 $(MANDIR)/man1/spamoracle.1
-	cp spamoracle.conf.5 $(MANDIR)/man5/spamoracle.conf.5
+	${BSD_INSTALL_PROGRAM} spamoracle $(BINDIR)/spamoracle
+	${BSD_INSTALL_MAN} spamoracle.1 $(MANDIR)/man1/spamoracle.1
+	${BSD_INSTALL_MAN} spamoracle.conf.5 $(MANDIR)/man5/spamoracle.conf.5
 
 spamoracle: $(NATOBJS)
 	$(OCAMLOPT) -o spamoracle $(NATLIBS) $(NATOBJS)