Match cdvmortgage.co.uk site too.

diff --git a/scripts/Makefile b/scripts/Makefile
index 408fac6..e838f55 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,9 +1,9 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.50 2006/08/04 12:20:06 rich Exp $
+# $Id: Makefile,v 1.51 2006/09/11 09:36:43 rich Exp $
 
 include ../Makefile.config
 
-PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma pgocaml.cma pa_pgsql.cmo
+PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/site-lib/pcre/pcre.cma $(OCAMLLIBDIR)/site-lib/extlib/extLib.cma $(OCAMLLIBDIR)/site-lib/calendar/calendar.cma pgocaml.cma pa_pgsql.cmo
 
 OCAMLC := ocamlc
 OCAMLCFLAGS := \

diff --git a/scripts/lib/cdvmm_phone_numbers.ml b/scripts/lib/cdvmm_phone_numbers.ml
index 6e31937..b43fd93 100644 (file)
--- a/scripts/lib/cdvmm_phone_numbers.ml
+++ b/scripts/lib/cdvmm_phone_numbers.ml
@@ -1,5 +1,5 @@
 (* An example of a pre-page handler and an external function.
- * $Id: cdvmm_phone_numbers.ml,v 1.2 2006/08/16 15:27:02 rich Exp $
+ * $Id: cdvmm_phone_numbers.ml,v 1.3 2006/09/11 09:36:43 rich Exp $
  *)
 
 open Apache
@@ -12,7 +12,7 @@ open Cocanwiki_strings
 
 (* Check we're running against the correct website. *)
 let rex =
-  Pcre.regexp "(\\.cdvmortgage\\.com|chasedevere\\.team-?notepad\\.com)$"
+  Pcre.regexp "(cdvmortgage\\.co(\\.uk|m)|chasedevere\\.team-?notepad\\.com)$"
 let check_website r =
   let hostname =
     try Request.hostname r

diff --git a/tools/Makefile b/tools/Makefile
index 55f29e5..7c63448 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,9 +1,9 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.1 2006/09/09 15:08:08 rich Exp $
+# $Id: Makefile,v 1.2 2006/09/11 09:36:43 rich Exp $
 
 include ../Makefile.config
 
-PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma pgocaml.cma pa_pgsql.cmo
+PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/site-lib/pcre/pcre.cma $(OCAMLLIBDIR)/site-lib/extlib/extLib.cma $(OCAMLLIBDIR)/site-lib/calendar/calendar.cma pgocaml.cma pa_pgsql.cmo
 
 OCAMLPACKAGES := -package pcre,extlib,netstring,calendar
 OCAMLCFLAGS := $(OCAMLPACKAGES) -I $(PGOCAMLDIR) -pp "$(PGOCAML_PP)"