No more need for symbolic links: .matita, the configuration file, etc. are

now looked for in the directory ./configure was launched in.

diff --git a/helm/matita/buildTimeConf.ml.in b/helm/matita/buildTimeConf.ml.in
index acb2a3feb8f819360c911f80b700e8e064cdd76e..e8eb4b4271f52cc3b5265b2c5fdcdf134e488409 100644 (file)
--- a/helm/matita/buildTimeConf.ml.in
+++ b/helm/matita/buildTimeConf.ml.in
@@ -40,4 +40,4 @@ let images_dir = runtime_base_dir ^ "/icons"
 let gtkrc_file = runtime_base_dir ^ "/matita.gtkrc"
 let lang_file  = runtime_base_dir ^ "/matita.lang"
 let script_template  = runtime_base_dir ^ "/matita.ma.templ"
-
+let matita_conf  = runtime_base_dir ^ "/matita.conf.xml"

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index a46024ba6c9d95d23072441c53b4573a4b78e49b..7e2591f8fc9b1d9d2de2e524565a1edffa635f1a 100644 (file)
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -89,7 +89,7 @@ if test "$DEBUG" = "true"; then
   echo "debugging enabled"
 fi
 
-RT_BASE_DIR="."
+RT_BASE_DIR=`pwd`
 
 AC_SUBST(CAMLP4O)
 AC_SUBST(DEBUG)

diff --git a/helm/matita/library/Makefile b/helm/matita/library/Makefile
index 116fc82448c59a64e43743c05730d6497f032ea8..7b456849aede0fd3c761f62e25476956d0ef8d65 100644 (file)
--- a/helm/matita/library/Makefile
+++ b/helm/matita/library/Makefile
@@ -12,7 +12,6 @@ MATITADEP=../matitadep
 MATITADEPOPT=../matitadep.opt
 
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml icons matita.ma.templ
 
 H=@
 
@@ -49,21 +48,4 @@ depend:
 $(DEPEND_NAME): $(SRC) $(LINKS)
        $(H)$(MATITADEP) $(SRC) > $@
 
-# Let's prepare the environment
-.matita:
-       $(H)ln -fs ../.matita .
-
-matita.lang:
-       $(H)ln -fs ../matita.lang .
-
-matita.conf.xml:
-       $(H)ln -fs ../matita.conf.xml .
-
-icons:
-       $(H)ln -fs ../icons .
-
-matita.ma.templ:
-       $(H)ln -fs ../matita.ma.templ .
-#done
-
 include $(DEPEND_NAME)

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 9551729a43e6bbf3a03ca23945ed95bfb35c9d2b..ade151a6900d28e0c395d6a44cb329d5442fc853 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -32,7 +32,7 @@ open MatitaMisc
 (** {2 Initialization} *)
 
 let _ =
-  Helm_registry.load_from "matita.conf.xml";  (* read conf *)
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
   MatitaDb.create_owner_environment ();

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index e72822fdcd7b37aa8e584943247a14d402250aa5..27147e6d422ec184112bbecf5a0b118a22440e7f 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -120,7 +120,7 @@ let rec interactive_loop () =
   | exn -> MatitaLog.error (Printexc.to_string exn); interactive_loop ()
 
 let go () =
-  Helm_registry.load_from "matita.conf.xml";
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
@@ -135,7 +135,7 @@ let dump_moo_to_file file moo =
  close_out os
   
 let main ~mode = 
-  Helm_registry.load_from "matita.conf.xml";
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
   MatitaDb.create_owner_environment ();

diff --git a/helm/matita/matitaclean.ml b/helm/matita/matitaclean.ml
index 60866fc1ae4702ff63df56cccc643a16040841da..69af9bf05078e954c0628116ed2d48766f085e33 100644 (file)
--- a/helm/matita/matitaclean.ml
+++ b/helm/matita/matitaclean.ml
@@ -2,7 +2,7 @@ module UM = UriManager;;
 module TA = TacticAst;;
 
 let _ =
-  Helm_registry.load_from "matita.conf.xml";
+  Helm_registry.load_from BuildTimeConf.matita_conf;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
   MatitaDb.create_owner_environment ()

diff --git a/helm/matita/tests/Makefile b/helm/matita/tests/Makefile
index 253a63d4c2d34d2d6764e8dc87955676b8bb5249..fb68f2b79a173260d4cb278e1fe3b9f7fd28be51 100644 (file)
--- a/helm/matita/tests/Makefile
+++ b/helm/matita/tests/Makefile
@@ -12,7 +12,6 @@ MATITADEP=../matitadep
 MATITADEPOPT=../matitadep.opt
 
 DEPEND_NAME=.depend
-LINKS=.matita matita.lang matita.conf.xml icons matita.ma.templ
 
 H=@
 
@@ -49,21 +48,4 @@ depend:
 $(DEPEND_NAME): $(SRC) $(LINKS)
        $(H)$(MATITADEP) $(SRC) > $@
 
-# Let's prepare the environment
-.matita:
-       $(H)ln -fs ../.matita .
-
-matita.lang:
-       $(H)ln -fs ../matita.lang .
-
-matita.conf.xml:
-       $(H)ln -fs ../matita.conf.xml .
-
-icons:
-       $(H)ln -fs ../icons .
-
-matita.ma.templ:
-       $(H)ln -fs ../matita.ma.templ .
-#done
-
 include $(DEPEND_NAME)