Fix the dist target to use the git archive command

awa/Makefile.in

@@ -127,51 +127,6 @@ pre-clean:
 	   $(MAKE) -C plugins/$$i clean ; \
 	done
 
-# Files to package in source distribution
-DISTFILES=README LICENSE.txt NOTICE.txt NEWS CHANGES ChangeLog config.guess configure config.sub \
-configure.in Makefile.in install-sh \
-awa.gpr.in tests.gpr.in config.gpr \
-src samples regtests db web bundles config awaunit awa_unit.gpr.in rules.mk.in \
-distrib test-mysql.properties test-sqlite.properties dynamo.xml plugins uml \
-debian
-
-pre-dist:
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	-rm -rf $(distdir)/samples/bin
-	-rm -rf $(distdir)/samples/atlas.gpr
-	-rm -rf $(distdir)/samples/tests.gpr
-	-rm -rf $(distdir)/samples/autom4te.cache
-	-rm -rf $(distdir)/samples/config.status
-	-rm -rf $(distdir)/samples/Makefile
-	-rm -rf $(distdir)/samples/obj
-	-rm -rf $(distdir)/regtests/result
-	-rm -rf $(distdir)/distrib/*.gpr
-	mkdir $(distdir)/bin
-	mkdir $(distdir)/obj
-	mkdir $(distdir)/lib
-
-# prepare before releasing a new version of the package
-# (collect information about changes and SVN repository)
-prepare-release:
-	# ${SVN} update
-	# ${SVN} info > CHANGES
-	# ${SVN} log -v > ChangeLog
-
 pre-install:
 	$(MKDIR) -p ${dynamodir}/base/uml
 	$(MKDIR) -p ${prefix}/share/doc/awa
@@ -218,4 +173,7 @@ endif
 
 post-install:	install-info
 
+dist:
+	cd .. && git archive -o $(DIST_FILE) --prefix=$(distdir)/ HEAD:awa
+
 force:

awa/rules.mk.in

@@ -142,40 +142,6 @@ rebuild: clean build
 generate:  post-generate
 	test ! -d db || $(DYNAMO) generate $(DYNAMO_ARGS)
 
-# Files to package in source distribution
-DISTFILES=README LICENSE.txt NOTICE.txt NEWS CHANGES config.guess configure config.sub \
-configure.in Makefile.in install-sh \
-awa.gpr.in awa_tests.gpr.in samples.gpr.in config.gpr \
-src samples regtests db web bundles config awaunit awaunit.gpr.in \
-distrib test-mysql.properties test-sqlite.properties dynamo.xml
-
-dist-prepare:   pre-dist-prepare
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	mkdir -p $(distdir)/bin
-	mkdir -p $(distdir)/obj
-	mkdir -p $(distdir)/lib
-dist:   pre-dist dist-prepare
-	tar --exclude=.svn --exclude="*~" --exclude="*.o" --exclude="*.ali" \
-	    --exclude="*.log" --exclude="*.a" --exclude=".project" \
-	    --exclude=".cproject" --exclude='autom4te.cache' \
-	    --exclude=".gb_project" \
-	    -cvzf $(DIST_FILE) $(distdir)
-
 install_static:
 	$(MAKE) AWA_LIBRARY_TYPE=static install_lib
 
@@ -256,7 +222,6 @@ pre-clean:
 pre-build:
 pre-install:
 pre-uninstall:
-pre-dist-prepare:
 post-build:
 post-install:
 post-generate: