|
 |
6659111 |
diff -up crm114-20100106-BlameMichelson.src/mailtrainer.crm.r crm114-20100106-BlameMichelson.src/mailtrainer.crm
|
|
|
6659111 |
--- crm114-20100106-BlameMichelson.src/mailtrainer.crm.r 2010-01-06 19:38:46.000000000 +0100
|
|
|
6659111 |
+++ crm114-20100106-BlameMichelson.src/mailtrainer.crm 2010-06-19 20:18:43.000000000 +0200
|
|
|
2479894 |
@@ -90,7 +90,7 @@ isolate (:log_rejections:) //
|
|
|
2479894 |
#
|
|
|
2479894 |
# this ISOLATE will guarantee that :fileprefix: exists, and keep it's
|
|
|
2479894 |
# prior (commandline) value if it does, and an empty string if it doesnt
|
|
|
2479894 |
-isolate (:fileprefix:) <default> //
|
|
|
2479894 |
+isolate (:fileprefix:) <default> /:*:_env_HOME:\/.crm114\//
|
|
|
2479894 |
isolate (:spamcss:) <default> /spam.css/
|
|
|
2479894 |
isolate (:goodcss:) <default> /nonspam.css/
|
|
|
2479894 |
#
|
|
|
9d76465 |
@@ -384,7 +384,7 @@ alter (:report:) /:*:report: concise lo
|
|
|
9d76465 |
# output / Full set of files, before sort-randomization: \n:*:randfiles:\n/
|
|
|
9d76465 |
# now randomize the files. NOTE that this requires a shuffler
|
|
|
9d76465 |
# command somewhere.
|
|
|
9d76465 |
- syscall (:*:randfiles:) (:randfiles:) /:*:fileprefix::*:trainer_randomizer_command: /
|
|
|
9d76465 |
+ syscall (:*:randfiles:) (:randfiles:) /:*:trainer_randomizer_command: /
|
|
|
9d76465 |
# output /\n Full set of files, after randomize: \n:*:randfiles:\n/
|
|
|
9d76465 |
|
|
|
9d76465 |
}
|
|
|
6659111 |
diff -up crm114-20100106-BlameMichelson.src/Makefile.r crm114-20100106-BlameMichelson.src/Makefile
|
|
|
6659111 |
--- crm114-20100106-BlameMichelson.src/Makefile.r 2010-01-06 19:38:46.000000000 +0100
|
|
|
6659111 |
+++ crm114-20100106-BlameMichelson.src/Makefile 2010-06-19 20:20:42.000000000 +0200
|
|
|
6659111 |
@@ -104,7 +104,7 @@ CFLAGS += -DVERSION='"$(VERSION)"'
|
|
|
6659111 |
# certain functions to be inline (I added that to force gcc to inline functions
|
|
|
6659111 |
# under high optimization but not under low so that debugging is possible -
|
|
|
6659111 |
# that's why DO_INLINES is defined at O3 but not O0 - JB):
|
|
|
6659111 |
-CFLAGS += -O3 -Wall -DDO_INLINES
|
|
|
9f327dd |
+CFLAGS += $(OPTFLAGS)
|
|
|
9f327dd |
# turn this one on for no optimization, but debugging
|
|
|
9f327dd |
#CFLAGS += -g -O0 -Wall
|
|
|
9f327dd |
#
|
|
|
6659111 |
@@ -119,7 +119,7 @@ CFLAGS += -O3 -Wall -DDO_INLINES
|
|
|
137fae3 |
# BSD users - do NOT use -static-libgcc!!!
|
|
|
6659111 |
# Also note that this keeps valgrind from running correctly so comment
|
|
|
6659111 |
# it out for debugging.
|
|
|
9f327dd |
-LDFLAGS += -static -static-libgcc
|
|
|
9f327dd |
+#LDFLAGS += -static -static-libgcc
|
|
|
4fa6490 |
# use this one if you want program profiling.
|
|
|
9f327dd |
#LDFLAGS += -static -static-libgcc -pg
|
|
|
9f327dd |
#LDFLAGS += -pg
|
|
|
6659111 |
@@ -361,13 +361,13 @@ install_utils:
|
|
|
8c8b2ea |
# Installing Utilities
|
|
|
9f327dd |
#
|
|
|
60dbba1 |
$(MAKE) cssmerge cssutil cssdiff osbf-util
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
60dbba1 |
# if you don't have EMACS installed in the default place, you
|
|
|
60dbba1 |
# won't get the crm114-mode.el automatically.
|
|
|
137fae3 |
- -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
137fae3 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
|
|
|
60dbba1 |
# use different name so we can keep it around along with default one
|
|
|
6659111 |
@@ -376,15 +376,15 @@ install_engine: crm114
|
|
|
8c8b2ea |
#
|
|
|
8c8b2ea |
# Installing engine
|
|
|
8c8b2ea |
#
|
|
|
137fae3 |
- install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
137fae3 |
+ install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
137fae3 |
|
|
|
60dbba1 |
install_binary_only: FORCE
|
|
|
137fae3 |
- install $(INSTALLFLAGS) crm114 $(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssdiff $(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) cssmerge $(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
9f327dd |
- install $(INSTALLFLAGS) cssutil $(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
- install $(INSTALLFLAGS) osbf-util $(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
137fae3 |
- -install $(INSTALLFLAGS) crm114-mode.el $(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
137fae3 |
+ install $(INSTALLFLAGS) crm114 $(DESTDIR)$(BINDIR)/crm$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssdiff $(DESTDIR)$(BINDIR)/cssdiff$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) cssmerge $(DESTDIR)$(BINDIR)/cssmerge$(VER_SUFFIX)
|
|
|
9f327dd |
+ install $(INSTALLFLAGS) cssutil $(DESTDIR)$(BINDIR)/cssutil$(VER_SUFFIX)
|
|
|
60dbba1 |
+ install $(INSTALLFLAGS) osbf-util $(DESTDIR)$(BINDIR)/osbf-util$(VER_SUFFIX)
|
|
|
137fae3 |
+ -install $(INSTALLFLAGS) crm114-mode.el $(DESTDIR)$(prefix)/share/emacs/site-lisp/crm114-mode.el$(VER_SUFFIX)
|
|
|
60dbba1 |
|
|
|
60dbba1 |
uninstall: FORCE
|
|
|
60dbba1 |
-rm -rf $(BINDIR)/crm$(VER_SUFFIX)
|