From f5c0b6df796b48ec739acfbac70fe70ff5449674 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 5 Jun 2009 11:15:51 +0000
Subject: Add git support to make dist/dis Small cleanups in make dist-svn
 (backport from trunk)

---
 Makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6ecddd9..bdd7e0e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,14 +44,30 @@ install:
 clean:
 	make -C po clean
 
-dis:
-	rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar*
+dis: dist
+dist:
+	rm -rf ../$(NAME)-$(VERSION).tar*
+	@if [ -e ".svn" ]; then \
+		$(MAKE) dist-svn; \
+	elif [ -e ".git" ]; then \
+		$(MAKE) dist-git; \
+	else \
+		echo "Unknown SCM (not SVN nor GIT)";\
+		exit 1; \
+	fi;
+	$(info $(NAME)-$(VERSION).tar.bz2 is ready)
+
+dist-svn:
+	rm -rf $(NAME)-$(VERSION)
 	svn export -q -rBASE . $(NAME)-$(VERSION)
-	find $(NAME)-$(VERSION) -name .cvsignore |xargs rm -rf
-	tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION)
-	bzip2 -9f ../$(NAME)-$(VERSION).tar
+	tar jcf ../$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
 	rm -rf $(NAME)-$(VERSION)
 
+dist-git:
+	 @git archive --prefix=$(NAME)-$(VERSION)/ HEAD | bzip2 >../$(NAME)-$(VERSION).tar.bz2;
+
+
+
 .PHONY: ChangeLog
 
 log: ChangeLog
-- 
cgit v1.2.1