From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 12 Dec 2012 12:27:03 +0000 (+0100)
Subject: Avoid hard coding VERSION in ykpers4win.
X-Git-Tag: v1.11.0~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae23e8da8fc61df444f61fec94bef4db3236d992;p=yubikey-personalization

Avoid hard coding VERSION in ykpers4win.
---

diff --git a/build-and-test.sh b/build-and-test.sh
index c54dbac..7d3b1b6 100755
--- a/build-and-test.sh
+++ b/build-and-test.sh
@@ -5,11 +5,11 @@ set -e
 autoreconf -i
 
 if [ "x$LIBUSB" = "xwindows" ]; then
-  ./configure --with-backend=stub
-  touch ChangeLog
-  make dist
-  make -f ykpers4win.mk ykpers4win32mingw32
+    ./configure --with-backend=stub
+    touch ChangeLog
+    make dist
+    make -f ykpers4win.mk ykpers4win32mingw32 `grep ^VERSION Makefile|sed 's/ = /=/'`
 else
-  ./configure --with-backend=$LIBUSB
-  make check
+    ./configure --with-backend=$LIBUSB
+    make check
 fi
diff --git a/ykpers4win.mk b/ykpers4win.mk
index a8e46af..0f95819 100644
--- a/ykpers4win.mk
+++ b/ykpers4win.mk
@@ -29,7 +29,6 @@
 LIBYUBIKEYVERSION=1.9
 PROJECT=yubikey-personalization
 PACKAGE=ykpers
-VERSION=1.10.1
 
 all: usage ykpers4win32 ykpers4win64