HELM_CONFIGURATION_PREFIX added to OCaml files

diff --git a/helm/interface/.depend b/helm/interface/.depend
index a495dfeabe522060659d9b116781f8842c619264..6402ae55b38660205eeab97dda6bbd52198d4bab 100644 (file)
--- a/helm/interface/.depend
+++ b/helm/interface/.depend
@@ -82,6 +82,8 @@ deannotate.cmo: cic.cmo
 deannotate.cmx: cic.cmx 
 cicXPath.cmo: cic.cmo 
 cicXPath.cmx: cic.cmx 
+pxpUriResolver.cmo: configuration.cmo 
+pxpUriResolver.cmx: configuration.cmx 
 annotationParser.cmo: annotationParser2.cmo pxpUriResolver.cmo 
 annotationParser.cmx: annotationParser2.cmx pxpUriResolver.cmx 
 annotationParser2.cmo: cic.cmo 

diff --git a/helm/interface/configuration.ml b/helm/interface/configuration.ml
index 6b0facf3398d3df21855657a19da923b7d8e7d99..9a36cb37dc52e1de0ddcbadbff4a76bae2e884b3 100644 (file)
--- a/helm/interface/configuration.ml
+++ b/helm/interface/configuration.ml
@@ -10,7 +10,14 @@
 (******************************************************************************)
 
 (* this should be the only hard coded constant *)
-let filename = "/home/cadet/sacerdot/local/etc/helm/configuration.xml";;
+let filename =
+ let prefix =
+  try
+   Sys.getenv "HELM_CONFIGURATION_PREFIX"
+  with
+   Not_found -> ""
+ in
+  prefix ^ "/local/etc/helm/configuration.xml";;
 
 exception Warnings;;
 

diff --git a/helm/interface/pxpUriResolver.ml b/helm/interface/pxpUriResolver.ml
index b5b37f3985c4459d11637c404ee94b6f2567ded4..6ebbf71bd4bf02165b140e00dc7cd292e4734578 100644 (file)
--- a/helm/interface/pxpUriResolver.ml
+++ b/helm/interface/pxpUriResolver.ml
@@ -11,11 +11,11 @@
 let resolve =
  function
     "http://localhost:8081/getdtd?url=cic.dtd" ->
-     "/home/pauillac/coq3/sacerdot/HELM/INTERFACE/examples/dtd/cic.dtd"
+     Configuration.dtd_dir ^ "/cic.dtd"
   | "http://localhost:8081/getdtd?url=maththeory.dtd" ->
-     "/home/pauillac/coq3/sacerdot/HELM/INTERFACE/examples/dtd/maththeory.dtd"
+     Configuration.dtd_dir ^ "/maththeory.dtd"
   | "http://localhost:8081/getdtd?url=annotations.dtd" ->
-     "/home/pauillac/coq3/sacerdot/HELM/INTERFACE/examples/dtd/annotations.dtd"
+     Configuration.dtd_dir ^ "/annotations.dtd"
   | s  -> s
 ;;