new standard library inside path

diff --git a/helm/software/matita/Makefile b/helm/software/matita/Makefile
index 544d0fd7024bd0521849926f1ab301c74d6e89d8..7c42dc8182e05e3c06fd6f37798224804804d5dc 100644 (file)
--- a/helm/software/matita/Makefile
+++ b/helm/software/matita/Makefile
@@ -285,6 +285,7 @@ endif
                ln -fs matita $(WHERE)/$$p;\
        done
        $(H)cp -a library/ $(WHERE)/ma/standard-library
+       $(H)cp -a nlibrary/ $(WHERE)/ma/new-standard-library
 
        $(H)touch install_preliminaries.stamp
 

diff --git a/helm/software/matita/buildTimeConf.ml.in b/helm/software/matita/buildTimeConf.ml.in
index 6f693a1387c3e953eb03f92358ff130a7532dec2..45b75736ea1d05b9d9fc4e9ed31d3c5d19e70c27 100644 (file)
--- a/helm/software/matita/buildTimeConf.ml.in
+++ b/helm/software/matita/buildTimeConf.ml.in
@@ -51,6 +51,8 @@ let matita_conf  = runtime_base_dir ^ "/matita.conf.xml"
 let closed_xml = runtime_base_dir ^ "/closed.xml"
 let gtkmathview_conf = runtime_base_dir ^ "/gtkmathview.matita.conf.xml"
 let stdlib_dir_devel = runtime_base_dir ^ "/library"
+let new_stdlib_dir_devel = runtime_base_dir ^ "/nlibrary"
 let stdlib_dir_installed = runtime_base_dir ^ "/ma/standard-library"
+let new_stdlib_dir_installed = runtime_base_dir ^ "/ma/new-standard-library"
 let help_dir = runtime_base_dir ^ "/help"
 

diff --git a/helm/software/matita/matitaInit.ml b/helm/software/matita/matitaInit.ml
index 3291cbc330b5e41224302dc210a2fb3b341fbe55..70125f54c222bb5dc3c3d146a8a7cc8aecfee294 100644 (file)
--- a/helm/software/matita/matitaInit.ml
+++ b/helm/software/matita/matitaInit.ml
@@ -176,7 +176,10 @@ let parse_cmdline init_status =
     let includes = ref [] in
     let default_includes = [ 
       BuildTimeConf.stdlib_dir_devel;
-      BuildTimeConf.stdlib_dir_installed ; ] 
+      BuildTimeConf.stdlib_dir_installed ; 
+      BuildTimeConf.new_stdlib_dir_devel;
+      BuildTimeConf.new_stdlib_dir_installed ; 
+    ] 
     in
     let absolutize s =
       if Pcre.pmatch ~pat:"^/" s then s else Sys.getcwd () ^"/"^s