implemented "install" target

diff --git a/Makefile b/Makefile
index 9be238e0ca8ed15e339d36fb49f2547b1dd0af05..6a16621dcd0c750e0c89c84510968c1cfe1192c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,8 @@ CLEAN_ON_DIST =               \
        components/license      \
        $(NULL)
 EXTRA_DIST =                   \
-       matita/dist/AUTHORS     \
+       matita/AUTHORS          \
+       matita/LICENSE          \
        matita/dist/COPYING     \
        matita/dist/INSTALL     \
        matita/dist/README      \
@@ -40,7 +41,7 @@ EXTRA_DIST =                  \
        Makefile.defs.in        \
        $(NULL)
 
-distcheck: dist dist_extract dist_build
+distcheck: dist dist_extract dist_test
 
 dist: dist_mktmpdir dist_export dist_mktarball dist_rmtmpdir
 dist/configure.ac: configure.ac matita/dist/configure.ac.sed
@@ -66,13 +67,14 @@ dist_mktarball:
 
 dist_extract:
        tar xzf $(DISTDIR).tar.gz
-dist_build:
+dist_test:
        (cd $(DISTDIR)/ \
          && ./configure \
          && $(MAKE) world \
-         && $(MAKE) library)
+         && $(MAKE) library \
+         && $(MAKE) install DESTDIR=`pwd`/install)
 
-.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_build dist_autotools
+.PHONY: dist dist_export dist_mktarball distcheck dist_extract dist_test dist_autotools
 
 # }}} End of distribution stuff
 

diff --git a/matita/Makefile b/matita/Makefile
index e453add9c86830f83baa0629eaf8ae3a0c9bbeca..749ed0f71ecf3880a5cb9c11ec96512a650bcd0b 100644 (file)
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -219,7 +219,7 @@ dist_library@%:
 
 endif
 
-DEST = @RT_BASE_DIR@
+DESTDIR = $(RT_BASE_DIR)
 INSTALL_STUFF =                        \
        icons/                          \
        matita.gtkrc                    \
@@ -227,21 +227,35 @@ INSTALL_STUFF =                   \
        matita.ma.templ                 \
        core_notation.moo               \
        matita.conf.xml                 \
+       matita.conf.xml.user            \
        closed.xml                      \
        gtkmathview.matita.conf.xml     \
        template_makefile.in            \
-       library/                        \
-       $(PROGRAMS_BYTE)                \
+       AUTHORS                         \
+       LICENSE                         \
        $(NULL)
 ifeq ($(HAVE_OCAMLOPT),yes)
 INSTALL_STUFF += $(PROGRAMS_OPT)
+else
+INSTALL_STUFF += $(PROGRAMS_BYTE)
 endif
 
 install:
-       install -d $(DEST)
-       cp -a .matita/
-       cp -a $(INSTALL_STUFF) $(DEST)
+       # install main dir and executables
+       install -d $(DESTDIR)
+       cp -a $(INSTALL_STUFF) $(DESTDIR)
+       # install the library and corresponding scripts
+       if [ -d $(DESTDIR)/library ]; then rm -rf $(DESTDIR)/library; fi
+       cp -a .matita/xml/matita/ $(DESTDIR)/library/
+       if [ -d $(DESTDIR)/ma ]; then rm -rf $(DESTDIR)/ma; fi
+       install -d $(DESTDIR)/ma
+ifeq ($(HAVE_OCAMLOPT),yes)
+       for p in $(PROGRAMS_BYTE); do ln -s $$p.opt $(DESTDIR)/$$p; done
+endif
+       cp -a library/ $(DESTDIR)/ma/stdlib/
+       cp -a contribs/ $(DESTDIR)/ma/contribs/
 uninstall:
+       rm -rf $(DESTDIR)
 
 STATIC_LINK = dist/static_link/static_link
 # for matita