+csv dep for PG'OCaml.

diff --git a/Makefile.config b/Makefile.config
index e06e126..79b8537 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,4 +1,4 @@
-# $Id: Makefile.config,v 1.33 2006/12/07 17:05:47 rich Exp $
+# $Id: Makefile.config,v 1.34 2007/02/24 17:28:50 rich Exp $

 
 PACKAGE := cocanwiki
 VERSION := 1.4.2
 
 PACKAGE := cocanwiki
 VERSION := 1.4.2


@@ -15,6 +15,9 @@ WIKIINSTALLDIR := /usr/share/cocanwiki
 # Location of PG'OCaml (http://merjis.com/developers/pgocaml)
 PGOCAMLDIR := $(HOME)/d/merjis/freeware/pgocaml
 
 # Location of PG'OCaml (http://merjis.com/developers/pgocaml)
 PGOCAMLDIR := $(HOME)/d/merjis/freeware/pgocaml
 

+# CSV (http://merjis.com/developers/csv)
+CSVDIR := $(HOME)/d/merjis/freeware/csv
+

 # Location of OCamlRSS and XML-Light.  These are optional, but if you
 # add them you will get RSS feeds using the {{rss:url=...}} notation.
 #
 # Location of OCamlRSS and XML-Light.  These are optional, but if you
 # add them you will get RSS feeds using the {{rss:url=...}} notation.
 #


@@ -32,4 +35,4 @@ XML_LIGHT := $(HOME)/d/ocaml/xml-light
 #XML_LIGHT := +xml-light
 
 # Location of the OCaml lib directory.
 #XML_LIGHT := +xml-light
 
 # Location of the OCaml lib directory.

-OCAMLLIBDIR := $(shell ocamlc -where)
\ No newline at end of file
+OCAMLLIBDIR := $(shell ocamlc -where)

diff --git a/scripts/Makefile b/scripts/Makefile
index 9885b02..230db03 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,16 +1,16 @@
 # Makefile for COCANWIKI.
 # Makefile for COCANWIKI.

-# $Id: Makefile,v 1.54 2006/12/08 15:36:44 rich Exp $
+# $Id: Makefile,v 1.55 2007/02/24 17:28:52 rich Exp $

 
 include ../Makefile.config
 
 
 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)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma $(CSVDIR)/csv/csv.cma pgocaml.cma pa_pgsql.cmo

 
 PACKAGES = apache,pcre,extlib,netstring,calendar
 
 OCAMLC := ocamlc
 OCAMLCFLAGS = \
        -package $(PACKAGES) \
 
 PACKAGES = apache,pcre,extlib,netstring,calendar
 
 OCAMLC := ocamlc
 OCAMLCFLAGS = \
        -package $(PACKAGES) \

-       -I $(PGOCAMLDIR) \
+       -I $(PGOCAMLDIR) -I $(CSVDIR) \

        -I lib -pp "$(PGOCAML_PP)"
 CPP := cpp
 
        -I lib -pp "$(PGOCAML_PP)"
 CPP := cpp
 

diff --git a/tools/Makefile b/tools/Makefile
index 41efbbb..5d592c2 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,13 +1,14 @@
 # Makefile for COCANWIKI.
 # Makefile for COCANWIKI.

-# $Id: Makefile,v 1.3 2006/09/11 09:38:59 rich Exp $
+# $Id: Makefile,v 1.4 2007/02/24 17:28:53 rich Exp $

 
 include ../Makefile.config
 
 
 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)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma $(CSVDIR)/csv/csv.cma pgocaml.cma pa_pgsql.cmo

 
 OCAMLPACKAGES := -package pcre,extlib,netstring,calendar
 
 OCAMLPACKAGES := -package pcre,extlib,netstring,calendar

-OCAMLCFLAGS := $(OCAMLPACKAGES) -I $(PGOCAMLDIR) -pp "$(PGOCAML_PP)"
-OCAMLCLIBS := -linkpkg pgocaml.cma
+OCAMLCFLAGS := $(OCAMLPACKAGES) -I $(PGOCAMLDIR) -I $(CSVDIR) \
+       -pp "$(PGOCAML_PP)"
+OCAMLCLIBS := -linkpkg csv.cma pgocaml.cma

 
 export PGDATABASE=cocanwiki
 
 
 export PGDATABASE=cocanwiki