release snapshot

diff --git a/helm/Makefile b/helm/Makefile
index de2a403c12d124d0cfc160bcea8b78f0da343f95..30ca291c77199b01590804ee6a4806049d284f71 100644 (file)
--- a/helm/Makefile
+++ b/helm/Makefile
@@ -38,24 +38,26 @@ EXTRA_DIST =                        \
        ./configure             \
        $(NULL)
 
-dist: autotools export mktarball
-distcheck: dist extract build
+dist: dist_autotools dist_export dist_mktarball
+distcheck: dist dist_extract dist_build
 
-autotools:
+dist_autotools:
        autoconf
+       ./configure
 
-export:
+dist_export:
        rm -rf $(DISTDIR)
        mkdir $(DISTDIR)
        svn export ocaml $(DISTDIR)/ocaml
        svn export matita $(DISTDIR)/matita
        (cd $(DISTDIR) && rm -f $(CLEAN_ON_DIST))
+       ln -fs matita.conf.xml.user $(DISTDIR)/matita/matita.conf.xml
        mv $(DISTDIR)/ocaml $(DISTDIR)/libs
        cp -r $(EXTRA_DIST) $(DISTDIR)
 
-mktarball:
-       tar cvzf $(DISTDIR).tar.gz $(DISTDIR)
+dist_mktarball:
+       tar czf $(DISTDIR).tar.gz $(DISTDIR)
 
-.PHONY: dist export mktarball distcheck extract build autotools
+.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_build dist_autotools
 .PHONY: all opt clean distclean
 

diff --git a/helm/Makefile.defs.in b/helm/Makefile.defs.in
index d466f70cbe34c64b3d02994c5771eaa01e73f6f8..b714a606e4fc346332c3fa0e5f1846e003708ac1 100644 (file)
--- a/helm/Makefile.defs.in
+++ b/helm/Makefile.defs.in
@@ -9,3 +9,4 @@ MATITA_CREQUIRES = @FINDLIB_CREQUIRES@
 MATITA_VERSION = @MATITA_VERSION@
 
 RT_BASE_DIR = @RT_BASE_DIR@
+DBHOST = @DBHOST@

diff --git a/helm/configure.ac b/helm/configure.ac
index 03a9ea05bae86a680eb1b990218eb7bded956c09..90d14f49f821f0b6515771015fe1e42682fa09d8 100644 (file)
--- a/helm/configure.ac
+++ b/helm/configure.ac
@@ -1,9 +1,9 @@
 AC_INIT(matita/matitaTypes.ml)
 
 # Distribution settings (i.e. settings to be manipulated before a release)
-DEBUG_DEFAULT="true"
-DEFAULT_DBHOST="mowgli.cs.unibo.it"
-RT_BASE_DIR_DEFAULT="`pwd`/matita"
+DEBUG_DEFAULT="false"
+DEFAULT_DBHOST="localhost"
+RT_BASE_DIR_DEFAULT="/usr/local/share/matita/"
 MATITA_VERSION="0.1.0"
 # End of distribution settings
 
@@ -175,8 +175,10 @@ AC_SUBST(RT_BASE_DIR)
 AC_SUBST(MATITA_VERSION)
 
 AC_OUTPUT([
+  $LIBSPATH/extlib/componentsConf.ml
   matita/matita.conf.xml.devel
   matita/matita.conf.xml.user
+  matita/matita.conf.xml.build
   matita/buildTimeConf.ml
   matita/gtkmathview.matita.conf.xml
   Makefile.defs