minor Makefile fixes for the release

diff --git a/matita/Makefile b/matita/Makefile
index aa73b16474af712640bf0c9a2a74aa3a4d867a1a..0a5fc3e92079b31eb4e58fd0a3c701f32261cf8d 100644 (file)
--- a/matita/Makefile
+++ b/matita/Makefile
@@ -56,6 +56,13 @@ CLEAN_ON_DIST =              \
        components/license      \
        matita/TPTP/            \
        matita/contribs/        \
+       components/binaries/matitaprover/benchmarks/ \
+       matita/library/         \
+       matita/nlibrary/        \
+       matita/scripts/ \
+       matita/tests/   \
+       matita/lib/lambdaN/     \
+       matita/lib/lambda/      \
        $(NULL)
 EXTRA_DIST =                   \
        matita/AUTHORS          \

diff --git a/matita/matita/Makefile b/matita/matita/Makefile
index bb8486dc3e9eca38f514a331f1a491a657621597..caf0f82ff4c7a682ff9f25485f8a312c7da85413 100644 (file)
--- a/matita/matita/Makefile
+++ b/matita/matita/Makefile
@@ -204,21 +204,6 @@ cleantests.opt: $(foreach d,$(TEST_DIRS_OPT),$(d)-cleantests-opt)
 
 # {{{ Distribution stuff
 
-ifeq ($(DISTRIBUTED),yes)
-
-
-dist_library: install_preliminaries 
-       $(H)echo "publish"
-       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitac -system -noinnertypes)
-       $(H)echo "destroy"
-       $(H)cd $(WHERE)/ma/standard-library;(HOME=$(WHERE) USER=builder MATITA_RT_BASE_DIR=$(WHERE) MATITA_FLAGS='$(MATITA_CFLAGS)' $(WHERE)/matitaclean)
-# sqlite3 only
-       $(H)cp $(WHERE)/.matita/matita.db  $(WHERE)/metadata.db || true
-#$(H)rm -rf $(WHERE)/.matita/
-       touch $@
-
-endif
-
 dist_pre: matitaGeneratedGui.ml
        $(MAKE) -C dist/ dist_pre
 
@@ -261,9 +246,7 @@ endif
        $(H)for p in $(INSTALL_PROGRAMS_LINKS_MATITA); do \
                ln -fs matita $(WHERE)/$$p;\
        done
-       $(H)cp -a lib $(WHERE)/ma/standard-library
-       $(H)rm -r $(WHERE)/ma/standard-library/lambda
-       $(H)rm -r $(WHERE)/ma/standard-library/lambdaN
+       $(H)cp -a lib $(WHERE)/lib
 
        $(H)touch install_preliminaries.stamp