From be4d6187ed0970df4b6285ee642d98ec1833a6fe Mon Sep 17 00:00:00 2001
From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Thu, 7 Jul 2005 15:27:14 +0000
Subject: [PATCH] No more need for symbolic links: .matita, the configuration
 file, etc. are now looked for in the directory ./configure was launched in.

---
 helm/matita/buildTimeConf.ml.in |  2 +-
 helm/matita/configure.ac        |  2 +-
 helm/matita/library/Makefile    | 18 ------------------
 helm/matita/matita.ml           |  2 +-
 helm/matita/matitacLib.ml       |  4 ++--
 helm/matita/matitaclean.ml      |  2 +-
 helm/matita/tests/Makefile      | 18 ------------------
 7 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/helm/matita/buildTimeConf.ml.in b/helm/matita/buildTimeConf.ml.in
index acb2a3feb..e8eb4b427 100644
--- 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 a46024ba6..7e2591f8f 100644
--- 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 116fc8244..7b456849a 100644
--- 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 9551729a4..ade151a69 100644
--- 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 e72822fdc..27147e6d4 100644
--- 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 60866fc1a..69af9bf05 100644
--- 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 253a63d4c..fb68f2b79 100644
--- 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)
-- 
2.39.2