From f9ebeb4695e5598fe9ffa80d938bdd484ac99dab Mon Sep 17 00:00:00 2001
From: Enrico Tassi <enrico.tassi@inria.fr>
Date: Mon, 11 Jul 2005 14:09:34 +0000
Subject: [PATCH] matita.conf.xml.sample is now generated

---
 helm/matita/Makefile.in                       | 19 ++++++++++++++++++-
 helm/matita/configure.ac                      |  5 +++++
 ...f.xml.sample => matita.conf.xml.sample.in} |  8 ++++----
 3 files changed, 27 insertions(+), 5 deletions(-)
 rename helm/matita/{matita.conf.xml.sample => matita.conf.xml.sample.in} (79%)

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 009a6cec1..4c3d9f305 100644
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -54,7 +54,23 @@ CCMOS =				\
 CLEANCMOS = $(CCMOS)
 
 
-all: matita matitac matitatop cicbrowser matitadep matitaclean
+all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean
+
+matita.conf.xml: matita.conf.xml.sample
+	@echo
+	@echo "matita.conf.xml.sample is newer than matita.conf.xml"
+	@echo
+	@echo "PLEASE update your configuration file!"
+	@echo "(copying matita.conf.xml.sample should work)"
+	@echo
+	@false
+
+matita.conf.xml.sample: matita.conf.xml.sample.in
+	autoconf
+	./configure
+	@echo 
+	@echo "WARNING: The configuration sample file has changed!"
+	@echo 
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
@@ -127,6 +143,7 @@ distclean: clean
 	rm -f config.log config.status Makefile buildTimeConf.ml
 	rm -f matita.glade.bak matita.gladep.bak
 	rm -rf autom4te.cache/
+	rm -f configure matita.conf.xml.sample
 
 tests: matitac matitadep matitaclean
 	@(cd library && make clean all)
diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index 7e2591f8f..293d8a767 100644
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -90,6 +90,8 @@ if test "$DEBUG" = "true"; then
 fi
 
 RT_BASE_DIR=`pwd`
+USER_HOME=`echo $HOME`
+USER_NAME=`echo $USER`
 
 AC_SUBST(CAMLP4O)
 AC_SUBST(DEBUG)
@@ -102,8 +104,11 @@ AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
 AC_SUBST(OCAMLFIND)
 AC_SUBST(RT_BASE_DIR)
+AC_SUBST(USER_HOME)
+AC_SUBST(USER_NAME)
 
 AC_OUTPUT([
+  matita.conf.xml.sample
   buildTimeConf.ml
   Makefile
 ])
diff --git a/helm/matita/matita.conf.xml.sample b/helm/matita/matita.conf.xml.sample.in
similarity index 79%
rename from helm/matita/matita.conf.xml.sample
rename to helm/matita/matita.conf.xml.sample.in
index 56a04d605..b353a8791 100644
--- a/helm/matita/matita.conf.xml.sample
+++ b/helm/matita/matita.conf.xml.sample.in
@@ -4,8 +4,8 @@
     <key name="auto_disambiguation">true</key>
     <key name="environment_trust">true</key>
     <key name="baseuri">cic:/matita/</key>
-    <key name="basedir">.matita/xml</key>
-    <key name="owner">@@OWNER@@</key>
+    <key name="basedir">@USER_HOME@/.matita/xml</key>
+    <key name="owner">@USER_NAME@</key>
 <!--     <key name="font_size">10</key> -->
     <key name="tactics_bar">false</key>
   </section>
@@ -16,7 +16,7 @@
     <key name="database">matita</key>
   </section>
   <section name="getter">
-    <key name="cache_dir">.matita/getter/cache</key>
+    <key name="cache_dir">@USER_HOME@/.matita/getter/cache</key>
     <key name="dtd_dir">/projects/helm/xml/dtd</key>
     <key name="prefix">
       cic:/
@@ -24,7 +24,7 @@
     </key>
     <key name="prefix">
       cic:/matita/
-      .matita/xml/matita/
+      file://@USER_HOME@/.matita/xml/matita/
     </key>
   </section>
 </helm_registry>
-- 
2.39.2