- uniformed command line handling of matitamake with that of other matita tools

[helm.git] / helm / software / Makefile

diff --git a/helm/software/Makefile b/helm/software/Makefile
index 30ca291c77199b01590804ee6a4806049d284f71..5ffb3574affefb6ee61818c9e5b8211c342c64be 100644 (file)
--- a/helm/software/Makefile
+++ b/helm/software/Makefile
@@ -1,7 +1,7 @@
 
 include Makefile.defs
 
-SUBDIRS = libs matita
+SUBDIRS = components matita
 
 all: $(foreach d,$(SUBDIRS),all.$(d))
 opt: $(foreach d,$(SUBDIRS),opt.$(d))
@@ -25,34 +25,37 @@ BASENAME = matita
 NULL =
 DISTDIR = $(BASENAME)-$(MATITA_VERSION)
 CLEAN_ON_DIST =                \
-       ocaml/license           \
+       components/license      \
        $(NULL)
 EXTRA_DIST =                   \
-       dist/AUTHORS            \
-       dist/COPYING            \
-       dist/INSTALL            \
-       dist/README             \
-       dist/ChangeLog          \
+       matita/dist/AUTHORS     \
+       matita/dist/COPYING     \
+       matita/dist/INSTALL     \
+       matita/dist/README      \
+       matita/dist/ChangeLog   \
        Makefile                \
        Makefile.defs.in        \
-       ./configure             \
        $(NULL)
 
-dist: dist_autotools dist_export dist_mktarball
+dist: dist_mktmpdir dist_export dist_mktarball dist_rmtmpdir
 distcheck: dist dist_extract dist_build
 
-dist_autotools:
-       autoconf
-       ./configure
-
-dist_export:
+dist/configure.ac: configure.ac matita/dist/configure.ac.sed
+       sed -f matita/dist/configure.ac.sed < $< > $@
+dist/configure: dist/configure.ac
+       cd dist && autoconf
+dist_mktmpdir:
+       test -d dist || mkdir dist
+dist_rmtmpdir:
+       test -d dist && rm -rf dist/ || true
+dist_export: dist/configure
        rm -rf $(DISTDIR)
        mkdir $(DISTDIR)
-       svn export ocaml $(DISTDIR)/ocaml
+       svn export components $(DISTDIR)/components
        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 $< $(DISTDIR)/configure
        cp -r $(EXTRA_DIST) $(DISTDIR)
 
 dist_mktarball: