Makefile use of git log OK if decorate is default

[cp210x.git] / Makefile

diff --git a/Makefile b/Makefile
index d5a0b17e4a4ec711b665407785dcf2de2352f64c..a661ec4c02a5870fe4cf3d1b7858d502bfeea40c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@
 
 # Change or override these values as necessary for each package release
 
-PKGVER  = 0.11.2
-DEBRELEASE = 6.1tmi
+PKGVER  = 0.11.3
+DEBRELEASE = 5tmi
 
 
 # No need to change anything below this line
@@ -14,7 +14,7 @@ REPOID := $(shell svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\
 ifeq (,$(REPOID))
   REPOID := $(shell git svn info 2>/dev/null | grep "Revision: " | sed -e s'/^[^0-9]*\([0-9]*\).*$$/svn:revision \1/')
 ifeq (,$(REPOID))
-    REPOID := $(shell git log -n1 2>/dev/null | head -1 | sed -e s'/^/git:/')
+    REPOID := $(shell git log --no-decorate -n1 2>/dev/null | head -1 | sed -e s'/^/git:/')
 endif
 endif
 ifeq (,$(REPOID))
@@ -68,11 +68,13 @@ $(BUILD)/src-stamp: Makefile.dkms dkms.conf $(wildcard src/*)
        mkdir -p $(BUILD)
        rm -rf $(BUILD)/$(DEBSRC)
        cp -a src $(BUILD)/$(DEBSRC)
-       perl -i -pe 's/xxPKGVERxx/$(PKGVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c
-       perl -i -pe 's/xxPKGVERxx/$(PKGVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c.karmic
+       perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c
+       perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c.karmic
+       perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c.lucid
+       perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/cp210x.c.maverick
        cp Makefile.dkms $(BUILD)/$(DEBSRC)
        cp dkms.conf $(BUILD)/$(DEBSRC)
-       perl -i -pe 's/xxPKGVERxx/$(PKGVER)/g' $(BUILD)/$(DEBSRC)/dkms.conf
+       perl -i -pe 's/xxDEBVERxx/$(DEBVER)/g' $(BUILD)/$(DEBSRC)/dkms.conf
        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)