X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=Makefile;h=2b77fc1fcb148037b89b7bdfac9826932378f8c7;hb=0727cf5b4bba23c38882a1a7c2cb0641b3119848;hp=fab3efb67500980d53176694966ec83f6a92ed9f;hpb=e928d503f79e9474b09f4f0d0677f7d9bc232bd2;p=cp210x.git

diff --git a/Makefile b/Makefile
index fab3efb..2b77fc1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,16 @@ BUILD = build
 KVER := $(shell uname -r)
 KSRCVER := $(shell echo $(KVER) | sed -e 's/-[0-9][^-]*-[a-zA-Z][^-]*$$//')
 PKGVER  = 0.11
-SVNRELEASE := $(shell svn info | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/\1/')
-DEBRELEASE := 0tmi$(SVNRELEASE)
+
+REPORELEASE := $(shell svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/\1/')
+ifeq (,$(REPORELEASE))
+  REPORELEASE := $(shell git svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/\1/')
+endif
+ifeq (,$(REPORELEASE))
+  $(error You much check the code out from svn using svn or git)
+endif
+
+DEBRELEASE := 0tmi$(REPORELEASE)
 DEBVER := $(PKGVER)-$(DEBRELEASE)
 RFC822DATE := $(shell date --rfc-822)
 ROOTNAME := cp210x
@@ -36,6 +44,7 @@ $(BUILD)/src-stamp: $(wildcard src/*)
 	rm -rf $(BUILD)/$(DEBSRC)
 	cp -a src $(BUILD)/$(DEBSRC)
 	find $(BUILD)/$(DEBSRC) -name .svn -type d -exec rm -rf "{}" ";" 2>/dev/null || exit 0
+	rm -rf $(BUILD)/$(DEBSRC)/.git || exit 0
 	tar -C $(BUILD) -czf $(BUILD)/$(TARFILE) $(DEBSRC)
 	touch $@
 
@@ -43,7 +52,7 @@ $(BUILD)/src-stamp: $(wildcard src/*)
 configure: $(BUILD)/debian-stamp
 $(BUILD)/debian-stamp: $(BUILD)/src-stamp $(wildcard debian.in/*)
 	mkdir -p $(BUILD)/$(DEBSRC)/debian
-	rsync --quiet -avz --exclude=.svn/ debian.in/ $(BUILD)/$(DEBSRC)/debian/
+	rsync --quiet -avz --exclude=.svn/ --exclude=.git/ debian.in/ $(BUILD)/$(DEBSRC)/debian/
 	perl -i -pe 's/xxPACKAGExx/$(PACKAGE)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxROOTNAMExx/$(ROOTNAME)/g' $(BUILD)/$(DEBSRC)/debian/*
 	perl -i -pe 's/xxPKGVERxx/$(PKGVER)/g' $(BUILD)/$(DEBSRC)/debian/*
@@ -63,7 +72,7 @@ debug:
 	@echo "BUILD = $(BUILD)"
 	@echo "KVER = $(KVER)"
 	@echo "PKGVER = $(PKGVER)"
-	@echo "SVNRELEASE = |$(SVNRELEASE)|"
+	@echo "REPORELEASE = |$(REPORELEASE)|"
 	@echo "DEBRELEASE = $(DEBRELEASE)"
 	@echo "DEBVER = $(DEBVER)"
 	@echo "RFC822DATE = $(RFC822DATE)"