diff -up crm114-20080703-BlameVT.src/mailtrainer.crm.r crm114-20080703-BlameVT.src/mailtrainer.crm
--- crm114-20080703-BlameVT.src/mailtrainer.crm.r	2008-05-22 18:42:17.000000000 +0200
+++ crm114-20080703-BlameVT.src/mailtrainer.crm	2010-06-19 20:06:30.000000000 +0200
@@ -80,7 +80,7 @@ isolate (:log_rejections:) //
 #
 #      this ISOLATE will guarantee that :fileprefix: exists, and keep it's
 #      prior (commandline) value if it does, and an empty string if it doesnt
-isolate (:fileprefix:) <default> //
+isolate (:fileprefix:) <default> /:*:_env_HOME:\/.crm114\//
 isolate (:spamcss:) <default> /spam.css/
 isolate (:goodcss:) <default> /nonspam.css/
 #
@@ -374,7 +374,7 @@ alter (:report:) /:*:report:  concise lo
     # output / Full set of files, before sort-randomization: \n:*:randfiles:\n/
     #    now randomize the files.  NOTE that this requires a shuffler
     #    command somewhere.
-    syscall (:*:randfiles:) (:randfiles:) /:*:fileprefix::*:trainer_randomizer_command: / 
+    syscall (:*:randfiles:) (:randfiles:) /:*:trainer_randomizer_command: / 
     # output /\n Full set of files, after randomize: \n:*:randfiles:\n/
 
 }
diff -up crm114-20080703-BlameVT.src/Makefile.r crm114-20080703-BlameVT.src/Makefile
--- crm114-20080703-BlameVT.src/Makefile.r	2008-07-01 01:28:43.000000000 +0200
+++ crm114-20080703-BlameVT.src/Makefile	2008-07-09 19:57:41.000000000 +0200
@@ -72,7 +72,7 @@ SYSTEMTYPE = POSIX
 #  really picayune stuff.
 #  
 #  Our default is with debugging, full optimization, and lots of warnings:
-CFLAGS += -g -O3 -Wall
+#CFLAGS += -g -O3 -Wall
 #     turn this one on for no optimization, but debugging and time profiling:
 #CFLAGS += -g -O0 -Wall -pg
 #     turn this one on for really picayune debugging:
@@ -84,7 +84,7 @@ CFLAGS += -g -O3 -Wall
 #    BSD users - do NOT use -static-libgcc!!!
 #LDFLAGS += -static -static-libgcc 
 #    use this one if you want program profiling.
-LDFLAGS += -static -static-libgcc -pg
+#LDFLAGS += -static -static-libgcc -pg
 #
 #   Any standard install flags?  We nominally use protection 755
 INSTALLFLAGS += -m 755
@@ -454,13 +454,13 @@ osbf-util: osbf-util.c crm_osbf_maintena
 		crm_util_errorhandlers.o \
 		crm_osbf_maintenance.o -lm -ltre -o osbf-util
 
-cssdiff: cssdiff.c crm_util_errorhandlers.o $(HFILES)
+cssdiff: cssdiff.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
 	$(CC)  $(CFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' -c cssdiff.c -o cssdiff.o
 	$(CC)  $(CFLAGS) $(LDFLAGS) \
 		crm_util_errorhandlers.o \
 		crm_str_funcs.o -ltre cssdiff.o -o cssdiff
 
-cssmerge: cssmerge.c crm_util_errorhandlers.o $(HFILES)
+cssmerge: cssmerge.c crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
 	$(CC)  $(CFLAGS) $(LDFLAGS) -D$(SYSTEMTYPE) -DVERSION='"$(VERSION)"' \
 		crm_str_funcs.o \
 		crm_util_errorhandlers.o \
@@ -493,13 +493,13 @@ install_utils:
 	#    Installing Utilities
 	#	
 	$(MAKE) cssmerge cssutil cssdiff osbf-util
-	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
-	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
+	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
 	#   if you don't have EMACS installed in the default place, you
 	#   won't get the crm114-mode.el automatically.
-	-install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 
 # use different name so we can keep it around along with default one
@@ -508,15 +508,15 @@ install_engine: crm114
 	#
 	#    Installing engine
 	#
-	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
 
 install_binary_only: FORCE
-	install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
-	install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)	
-	install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
-	-install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
+	install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
+	install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)	
+	install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
+	-install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
 
 uninstall: FORCE
 	-rm -rf $(BINDIR)/crm$(VER_SUFFIX)