X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.config;h=79b85374196feefde241647f91cc099786e01686;hb=d2de471ff7e79c1d6096bd8132aad80258852cdd;hp=24a30bc58b0923f771e44229ab90340a4545de39;hpb=5433d3e4a93643e917d2554bc9d10b87bfa79609;p=cocanwiki.git

diff --git a/Makefile.config b/Makefile.config
index 24a30bc..79b8537 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,7 +1,7 @@
-# $Id: Makefile.config,v 1.29 2005/12/05 10:07:44 rich Exp $
+# $Id: Makefile.config,v 1.34 2007/02/24 17:28:50 rich Exp $
 
 PACKAGE := cocanwiki
-VERSION := 1.3.20
+VERSION := 1.4.2
 
 # Normally ignored.  However, if you are installing centrally (using
 # 'make pkg-install'), then the components are installed in the
@@ -11,3 +11,28 @@ VERSION := 1.3.20
 APACHECONFDIR := /etc/apache
 
 WIKIINSTALLDIR := /usr/share/cocanwiki
+
+# 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.
+#
+# To disable this feature, just comment these lines out.
+#
+# To enable the rss function, you also need to manually set
+# enable_rss_func = true in the relevant row of the hosts table.
+#
+# NB. RSS allows third party sites to place arbitrary content on your
+# site.  You should not use this if you care about cross-site scripting,
+# particularly not on an open wiki.
+#
+OCAMLRSS := $(HOME)/d/ocamlrss
+XML_LIGHT := $(HOME)/d/ocaml/xml-light
+#XML_LIGHT := +xml-light
+
+# Location of the OCaml lib directory.
+OCAMLLIBDIR := $(shell ocamlc -where)