diff -up crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf.r crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf
--- crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf.r	2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/mailfilter.cf	2010-06-19 19:29:59.000000000 +0200
@@ -260,7 +260,7 @@
 #            ------  options to shuffle.crm will work fine.  Alternatively,
 #             ------  you can use the "sort --key 1.2" on date-named files to
 #              -----   achieve chronological training
-:trainer_randomizer_command: /.\/shuffle.crm/
+:trainer_randomizer_command: /\/usr\/share\/crm114\/shuffle.crm/
 #:trainer_randomizer_command: /.\/crm114 shuffle.crm/
 #:trainer_randomizer_command: /sort --key 1.2/
 
diff -up crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm.r crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm
--- crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm.r	2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/mailtrainer.crm	2010-06-19 19:20:31.000000000 +0200
@@ -90,7 +90,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/
 #
diff -up crm114-20090807-BlameThorstenAndJenny.src/Makefile.r crm114-20090807-BlameThorstenAndJenny.src/Makefile
--- crm114-20090807-BlameThorstenAndJenny.src/Makefile.r	2009-08-07 17:22:37.000000000 +0200
+++ crm114-20090807-BlameThorstenAndJenny.src/Makefile	2010-06-19 19:22:32.000000000 +0200
@@ -98,7 +98,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
 #  really picayune stuff.
 #
 #  Our default is with debugging, full optimization, and lots of warnings:
-CFLAGS += -O3 -Wall
+CFLAGS += $(OPTFLAGS)
 #     turn this one on for no optimization, but debugging
 #CFLAGS += -g -O0 -Wall
 #
@@ -111,7 +111,7 @@ CFLAGS += -O3 -Wall
 #   Comment this out if you want dynamic linking
 #
 #    BSD users - do NOT use -static-libgcc!!!
-LDFLAGS += -static -static-libgcc
+#LDFLAGS += -static -static-libgcc
 #    use this one if you want program profiling.
 #LDFLAGS += -static -static-libgcc -pg
 #LDFLAGS += -pg
@@ -350,13 +350,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
@@ -365,15 +365,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)