Add install_sos make target for .el building

diff --git a/Makefile b/Makefile
index c837af1..b92bf32 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ EMACS_DIR := /usr/local/share/emacs/site-lisp/domtool-mode
 config.sml:
        echo -e 'structure Config :> CONFIG = struct\nopen ConfigDefault\nend' > $@
 
-.PHONY: all mlton smlnj install
+.PHONY: all mlton smlnj install install_sos
 
 mlton: bin/domtool-server bin/domtool-client bin/domtool-slave \
        bin/domtool-admin bin/domtool-doc bin/dbtool bin/vmail \
@@ -175,7 +175,11 @@ bin/webbw: $(COMMON_MLTON_DEPS) src/stats/webbw.mlb
 elisp/domtool-tables.el: lib/*.dtl bin/domtool-doc
        bin/domtool-doc -basis -emacs >$@
 
-install:
+install_sos:
+       cp openssl/openssl_sml.so /usr/local/lib/
+       cp pcre/pcre_sml.so /usr/local/lib/
+
+install: install_sos
        cp scripts/domtool-publish /usr/local/sbin/
        cp scripts/domtool-reset-global /usr/local/sbin/
        cp scripts/domtool-reset-local /usr/local/sbin/
@@ -189,8 +193,6 @@ install:
        cp scripts/domtool-slave-logged /usr/local/bin/
        cp scripts/domtool-server /etc/init.d/
        cp scripts/domtool-slave /etc/init.d/
-       cp openssl/openssl_sml.so /usr/local/lib/
-       cp pcre/pcre_sml.so /usr/local/lib/
        -cp bin/domtool-server /usr/local/sbin/
        -cp bin/domtool-slave /usr/local/sbin/
        -cp bin/domtool-client /usr/local/bin/domtool

diff --git a/lib/mod_rewrite.dtl b/lib/mod_rewrite.dtl
index 2e29877..71ced0e 100644 (file)
--- a/lib/mod_rewrite.dtl
+++ b/lib/mod_rewrite.dtl
@@ -46,11 +46,14 @@ extern type mod_rewrite_cond_flag;
 extern val cond_nocase : mod_rewrite_cond_flag;
 extern val ornext : mod_rewrite_cond_flag;
 
-extern val rewriteRule : no_spaces -> no_spaces -> [mod_rewrite_flag] -> [^Vhost];
+extern type regexp;
+{{PCRE regular expression}}
+
+extern val rewriteRule : regexp -> no_spaces -> [mod_rewrite_flag] -> [^Vhost];
 {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html#rewriterule">Apache
   documentation for <tt>RewriteRule</tt></a>.}}
 
-extern val rewriteCond : no_spaces -> no_spaces -> [mod_rewrite_cond_flag] -> [^Vhost];
+extern val rewriteCond : no_spaces -> regexp -> [mod_rewrite_cond_flag] -> [^Vhost];
 {{See <a href="http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html#rewritecond">Apache
   documentation for <tt>RewriteCond</tt></a>.}}