X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2FMakefile;h=ce51f175b2f184f6d6d1d80d36b781f8d9917c6f;hb=3e1e59644a24ed855a7f21bf9eab76f96577fd17;hp=dfd4b58341d6fea4a9a0d99ce5463685f2fb2c5f;hpb=2851de1130a59daee3776c3264dbd4d04d64d70b;p=helm.git

diff --git a/helm/software/Makefile b/helm/software/Makefile
index dfd4b5834..ce51f175b 100644
--- a/helm/software/Makefile
+++ b/helm/software/Makefile
@@ -27,14 +27,18 @@ else
 endif
 	$(H)touch depend-stamp
 
-clean: $(foreach d,$(SUBDIRS),rec@clean@$(d))
-distclean: $(foreach d,$(SUBDIRS),rec@distclean@$(d))
+clean: 
+	$(H)make $(foreach d,$(SUBDIRS),rec@clean@$(d)) || true
+distclean: 
+	$(H)make $(foreach d,$(SUBDIRS),rec@distclean@$(d)) || true
 	$(H)rm -rf .matita library-stamp depend-stamp
-install: $(foreach d,$(SUBDIRS),rec@install@$(d))
+install-indep: $(foreach d,$(SUBDIRS),rec@install-indep@$(d))
+install-arch: $(foreach d,$(SUBDIRS),rec@install-arch@$(d))
+install: install-indep install-arch
 uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d))
 
 rec@%:
-	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*))
+	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) DESTDIR=$(shell pwd)/$(DESTDIR)
 
 # {{{ Distribution stuff
 
@@ -50,6 +54,8 @@ NULL =
 DISTDIR = $(BASENAME)-$(MATITA_VERSION)
 CLEAN_ON_DIST = 		\
 	components/license	\
+	matita/TPTP/		\
+	matita/contribs/	\
 	$(NULL)
 EXTRA_DIST = 			\
 	matita/AUTHORS 		\
@@ -85,7 +91,8 @@ dist_export: dist/configure
 	svn export components $(DISTDIR)/components
 	svn export matita $(DISTDIR)/matita
 	(cd $(DISTDIR) && find . -name .depend -exec rm \{\} \;)
-	(cd $(DISTDIR) && rm -f $(CLEAN_ON_DIST))
+	(cd $(DISTDIR) && find . -name .depend.opt -exec rm \{\} \;)
+	(cd $(DISTDIR) && rm -rf $(CLEAN_ON_DIST))
 	cp $< $(DISTDIR)/configure
 	cp -r $(EXTRA_DIST) $(DISTDIR)
 	cp -r $(EXTRA_DIST_matita) $(DISTDIR)/matita
@@ -94,7 +101,7 @@ dist_export: dist/configure
 	$(MAKE) -C matita/help/C/ install DESTDIR=$(CURDIR)/$(DISTDIR)/docs/manual/
 dist_mktarball:
 	tar czf $(DISTDIR).tar.gz $(DISTDIR)
-	tar cjf $(DISTDIR).tar.bz2 $(DISTDIR)
+	#tar cjf $(DISTDIR).tar.bz2 $(DISTDIR)
 	rm -rf $(DISTDIR)
 
 dist_extract: